diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-06-22 20:04:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-22 20:04:47 +0200 |
| commit | f7d323f2ba4cd773b3badeddc723ca657195b6cb (patch) | |
| tree | eb7e4db5574eeb80c1a3388f1a18129bc6dda35e | |
| parent | 6158cee7926b34c4b81448842c372051b517fa95 (diff) | |
| parent | 5638fa2a3e089936822f909df8403c3153abe733 (diff) | |
| download | vyos-build-f7d323f2ba4cd773b3badeddc723ca657195b6cb.tar.gz vyos-build-f7d323f2ba4cd773b3badeddc723ca657195b6cb.zip | |
Merge pull request #663 from vyos/mergify/bp/sagitta/pr-660
Kernel: T5887: update Linux Kernel to v6.6.35 (backport #660)
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index 7df81ec2..77b4130e 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.33" +kernel_version = "6.6.35" 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 af67ef5c..a4026a24 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 @@ -126,10 +126,10 @@ index 9dfbda164e8c..2786c8ea451a 100644 .procname = "ioam6_id", .data = &ipv6_devconf.ioam6_id, diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index 236a45557ba1..96a8dda0d423 100644 +index c48eaa7c2340..309a93100c34 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -676,6 +676,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh) +@@ -677,6 +677,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh) } #endif @@ -144,7 +144,7 @@ index 236a45557ba1..96a8dda0d423 100644 /* * Default Router Selection (RFC 2461 6.3.6) */ -@@ -717,6 +725,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif, +@@ -718,6 +726,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif, if (!m && (strict & RT6_LOOKUP_F_IFACE)) return RT6_NUD_FAIL_HARD; |