diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-11-25 11:37:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-25 11:37:58 +0100 |
| commit | 87483cc598101da283552d437fbf44e335317df7 (patch) | |
| tree | d7211cab01cea5042633c13fea2420bfea5bd90e | |
| parent | 43a9ba3fe13a3ebc7367927d32f0322586d911b7 (diff) | |
| parent | 4bd00bd0e3535dd43a37c5be69a5548e946834b9 (diff) | |
| download | vyos-build-87483cc598101da283552d437fbf44e335317df7.tar.gz vyos-build-87483cc598101da283552d437fbf44e335317df7.zip | |
Merge pull request #1071 from c-po/kernel-6.6.117
Kernel: T8035: update Linux Kernel to v6.6.117
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | scripts/package-build/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 a6b5c98d..39a29551 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "https://packages.vyos.net/repositories/current" vyos_branch = "current" release_train = "current" -kernel_version = "6.6.114" +kernel_version = "6.6.117" kernel_flavor = "vyos" bootloaders = "syslinux,grub-efi" diff --git a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch index 0f30074f..530dd549 100644 --- a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch +++ b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch @@ -101,7 +101,7 @@ index 798497c8b192..0b4510b06ab5 100644 }; diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c -index 1c3b0ba289fb..075da0727e7d 100644 +index 0e49ee83533b..227e9e439fea 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5671,6 +5671,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, @@ -112,7 +112,7 @@ index 1c3b0ba289fb..075da0727e7d 100644 } static inline size_t inet6_ifla6_size(void) -@@ -7113,6 +7114,13 @@ static const struct ctl_table addrconf_sysctl[] = { +@@ -7115,6 +7116,13 @@ static const struct ctl_table addrconf_sysctl[] = { .extra1 = (void *)SYSCTL_ZERO, .extra2 = (void *)SYSCTL_ONE, }, |