Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history
* https://github.com/coolsnowwolf/lede:
  kernel: bump 5.15 to 5.15.144 (coolsnowwolf#11728)
  kernel: bump 5.10 to 5.10.205 (coolsnowwolf#11730)
  kernel: bump 5.4 to 5.4.265 (coolsnowwolf#11723)
  kernel: bump 6.1 to 6.1.69 (coolsnowwolf#11729)
  • Loading branch information
UtMetoo committed Dec 22, 2023
2 parents 3774c7b + 6070792 commit 23733f8
Show file tree
Hide file tree
Showing 59 changed files with 176 additions and 1,929 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.10
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .204
LINUX_KERNEL_HASH-5.10.204 = ff950750b1060f65c0dde7d4d89238937d80faddf3bcf9ba28189d917daccaee
LINUX_VERSION-5.10 = .205
LINUX_KERNEL_HASH-5.10.205 = c55217a80d74f81b83116289a8bfe4302293390b45aeabb76f64814920788863
4 changes: 2 additions & 2 deletions include/kernel-5.15
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .143
LINUX_KERNEL_HASH-5.15.143 = 096bb16ec07232f27f6a07998c41b655883a8d0a6bb613d39bf524a9ffd99e02
LINUX_VERSION-5.15 = .144
LINUX_KERNEL_HASH-5.15.144 = f053afafafce771acbf478afdd16e9aa85b0a0e328205c4f53276062300a5b3b
4 changes: 2 additions & 2 deletions include/kernel-5.4
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .264
LINUX_KERNEL_HASH-5.4.264 = d39c90dd9297a36aab7246b516f61e21493826004011f161090bce84db21b6b0
LINUX_VERSION-5.4 = .265
LINUX_KERNEL_HASH-5.4.265 = 4dae99e49f466d4689e128ec023754908147159d7462019a83c7da1f25df9b15
4 changes: 2 additions & 2 deletions include/kernel-6.1
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .68
LINUX_KERNEL_HASH-6.1.68 = 365ff26a30e206de9b18489f45d38582a0a61b7c5919f8ab89295a47316784e1
LINUX_VERSION-6.1 = .69
LINUX_KERNEL_HASH-6.1.69 = 7e3d2694d18ce502068cc88a430da809abbd17d0773268524ebece442612b541
Original file line number Diff line number Diff line change
Expand Up @@ -579,15 +579,15 @@ SVN-Revision: 35130
* XXX skbs on the gro_list have all been parsed and pulled
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -47,7 +47,7 @@ struct prefix_info {
@@ -52,7 +52,7 @@ struct prefix_info {
__be32 reserved2;

struct in6_addr prefix;
-};
+} __attribute__((packed, aligned(2)));

#include <linux/ipv6.h>
#include <linux/netdevice.h>
/* rfc4861 4.6.2: IPv6 PIO is 32 bytes in size */
static_assert(sizeof(struct prefix_info) == 32);
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -140,9 +140,9 @@ static inline int IP6_ECN_set_ce(struct
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -589,15 +589,15 @@ SVN-Revision: 35130
* XXX skbs on the gro_list have all been parsed and pulled
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -47,7 +47,7 @@ struct prefix_info {
@@ -52,7 +52,7 @@ struct prefix_info {
__be32 reserved2;

struct in6_addr prefix;
-};
+} __attribute__((packed, aligned(2)));

#include <linux/ipv6.h>
#include <linux/netdevice.h>
/* rfc4861 4.6.2: IPv6 PIO is 32 bytes in size */
static_assert(sizeof(struct prefix_info) == 32);
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -138,9 +138,9 @@ static inline int IP6_ECN_set_ce(struct
Expand Down
Loading

0 comments on commit 23733f8

Please sign in to comment.