diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-19 08:30:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-19 08:30:05 +0200 |
| commit | 71bab88d8c1b6e03fda4ac50e5fd9e0934958e19 (patch) | |
| tree | f6afdd805e03d0cd52ef660f30d93adb7b679162 | |
| parent | b9c4a6a2186ca057dc900b3ae225f335d2d0a578 (diff) | |
| parent | ce9683654fad98d50cd87adfe31876ad6937d460 (diff) | |
| download | vyos-build-71bab88d8c1b6e03fda4ac50e5fd9e0934958e19.tar.gz vyos-build-71bab88d8c1b6e03fda4ac50e5fd9e0934958e19.zip | |
Merge pull request #630 from vyos/mergify/bp/sagitta/pr-629
Kernel: T5887: update Linux Kernel to v6.6.31 (backport #629)
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index c1d27ce5..d00c35dd 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/sagitta" vyos_branch = "sagitta" release_train = "sagitta" -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, }, |