summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-05-19 08:22:04 +0200
committerGitHub <noreply@github.com>2024-05-19 08:22:04 +0200
commitd1852e392e760e139e69ce51e8cd74ffbf92aeea (patch)
treeec50d4d9695fb0d8a27f28d38810112a680add19
parentbe1d2fae7810962dae1231e66b63fa38af071a56 (diff)
parent20b42272c56e5cd006f7f5096fe90520f4b2da00 (diff)
downloadvyos-build-d1852e392e760e139e69ce51e8cd74ffbf92aeea.tar.gz
vyos-build-d1852e392e760e139e69ce51e8cd74ffbf92aeea.zip
Merge pull request #629 from c-po/T5887-kernel
Kernel: T5887: update Linux Kernel to v6.6.31
-rw-r--r--data/defaults.toml2
-rw-r--r--packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/data/defaults.toml b/data/defaults.toml
index 6d535369..45579808 100644
--- a/data/defaults.toml
+++ b/data/defaults.toml
@@ -14,7 +14,7 @@ vyos_mirror = "https://rolling-packages.vyos.net/current"
vyos_branch = "current"
release_train = "current"
-kernel_version = "6.6.30"
+kernel_version = "6.6.31"
bootloaders = "syslinux,grub-efi"
squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery"
diff --git a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
index 2e9b4dd6..af67ef5c 100644
--- a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
+++ b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
@@ -100,7 +100,7 @@ index bc74f131fe4d..9cdd5b50f9b2 100644
};
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index d1806eee1687..b4893d713b8c 100644
+index 9dfbda164e8c..2786c8ea451a 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -5656,6 +5656,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
@@ -111,7 +111,7 @@ index d1806eee1687..b4893d713b8c 100644
}
static inline size_t inet6_ifla6_size(void)
-@@ -7084,6 +7085,13 @@ static const struct ctl_table addrconf_sysctl[] = {
+@@ -7085,6 +7086,13 @@ static const struct ctl_table addrconf_sysctl[] = {
.extra1 = (void *)SYSCTL_ZERO,
.extra2 = (void *)SYSCTL_ONE,
},