Skip to content

Commit 71bab88

Browse files
authored
Merge pull request #630 from vyos/mergify/bp/sagitta/pr-629
Kernel: T5887: update Linux Kernel to v6.6.31 (backport #629)
2 parents b9c4a6a + ce96836 commit 71bab88

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

data/defaults.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/sagitta"
1414
vyos_branch = "sagitta"
1515
release_train = "sagitta"
1616

17-
kernel_version = "6.6.30"
17+
kernel_version = "6.6.31"
1818
bootloaders = "syslinux,grub-efi"
1919

2020
squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery"

packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ index bc74f131fe4d..9cdd5b50f9b2 100644
100100
};
101101

102102
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
103-
index d1806eee1687..b4893d713b8c 100644
103+
index 9dfbda164e8c..2786c8ea451a 100644
104104
--- a/net/ipv6/addrconf.c
105105
+++ b/net/ipv6/addrconf.c
106106
@@ -5656,6 +5656,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
@@ -111,7 +111,7 @@ index d1806eee1687..b4893d713b8c 100644
111111
}
112112

113113
static inline size_t inet6_ifla6_size(void)
114-
@@ -7084,6 +7085,13 @@ static const struct ctl_table addrconf_sysctl[] = {
114+
@@ -7085,6 +7086,13 @@ static const struct ctl_table addrconf_sysctl[] = {
115115
.extra1 = (void *)SYSCTL_ZERO,
116116
.extra2 = (void *)SYSCTL_ONE,
117117
},

0 commit comments

Comments
 (0)