Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kernel: T5887: update Linux Kernel to v6.6.36 (backport #681) #682

Merged
merged 1 commit into from
Jul 4, 2024
Merged

Kernel: T5887: update Linux Kernel to v6.6.36 (backport #681) #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/defaults.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/sagitta"
vyos_branch = "sagitta"
release_train = "sagitta"

kernel_version = "6.6.35"
kernel_version = "6.6.36"
bootloaders = "syslinux,grub-efi"

squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery"
Expand Down
6 changes: 3 additions & 3 deletions packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 c48eaa7c2340..309a93100c34 100644
index eb3afaee62e8..0f8670e74cc7 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -677,6 +677,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
@@ -679,6 +679,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
}
#endif

Expand All @@ -144,7 +144,7 @@ index c48eaa7c2340..309a93100c34 100644
/*
* Default Router Selection (RFC 2461 6.3.6)
*/
@@ -718,6 +726,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif,
@@ -720,6 +728,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;
Expand Down
Loading