Skip to content

Commit 87483cc

Browse files
authored
Merge pull request #1071 from c-po/kernel-6.6.117
Kernel: T8035: update Linux Kernel to v6.6.117
2 parents 43a9ba3 + 4bd00bd commit 87483cc

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

data/defaults.toml

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

17-
kernel_version = "6.6.114"
17+
kernel_version = "6.6.117"
1818
kernel_flavor = "vyos"
1919
bootloaders = "syslinux,grub-efi"
2020

scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ index 798497c8b192..0b4510b06ab5 100644
101101
};
102102

103103
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
104-
index 1c3b0ba289fb..075da0727e7d 100644
104+
index 0e49ee83533b..227e9e439fea 100644
105105
--- a/net/ipv6/addrconf.c
106106
+++ b/net/ipv6/addrconf.c
107107
@@ -5671,6 +5671,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
@@ -112,7 +112,7 @@ index 1c3b0ba289fb..075da0727e7d 100644
112112
}
113113

114114
static inline size_t inet6_ifla6_size(void)
115-
@@ -7113,6 +7114,13 @@ static const struct ctl_table addrconf_sysctl[] = {
115+
@@ -7115,6 +7116,13 @@ static const struct ctl_table addrconf_sysctl[] = {
116116
.extra1 = (void *)SYSCTL_ZERO,
117117
.extra2 = (void *)SYSCTL_ONE,
118118
},

0 commit comments

Comments
 (0)