summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-08-11 14:46:58 +0200
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-08-12 09:33:01 +0000
commitcd8719d645d7049658f78cdb1532df4c9dbc4f80 (patch)
treeec4d48dd53a1b3d911736ea3dfb7aab7b3285893
parent995e2ee5c8e46e37bfc7b5a89f9319636766cff2 (diff)
downloadvyos-build-mergify/bp/sagitta/pr-733.tar.gz
vyos-build-mergify/bp/sagitta/pr-733.zip
Kernel: T5887: update Linux Kernel to v6.6.45mergify/bp/sagitta/pr-733
(cherry picked from commit faa6453ec86ecebeff2e2a28dd01db2ee655a22c)
-rw-r--r--data/defaults.toml2
-rw-r--r--packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch6
2 files changed, 4 insertions, 4 deletions
diff --git a/data/defaults.toml b/data/defaults.toml
index 18cd4ed1..8e72211f 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.43"
+kernel_version = "6.6.45"
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 9d10ec7e..bedcec6e 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,10 +100,10 @@ index bc74f131fe4d..9cdd5b50f9b2 100644
};
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index 9dfbda164e8c..2786c8ea451a 100644
+index a9358c796a81..7e39846f556b 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,
+@@ -5657,6 +5657,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
array[DEVCONF_NDISC_EVICT_NOCARRIER] = cnf->ndisc_evict_nocarrier;
array[DEVCONF_ACCEPT_UNTRACKED_NA] = cnf->accept_untracked_na;
array[DEVCONF_ACCEPT_RA_MIN_LFT] = cnf->accept_ra_min_lft;
@@ -111,7 +111,7 @@ index 9dfbda164e8c..2786c8ea451a 100644
}
static inline size_t inet6_ifla6_size(void)
-@@ -7085,6 +7086,13 @@ static const struct ctl_table addrconf_sysctl[] = {
+@@ -7086,6 +7087,13 @@ static const struct ctl_table addrconf_sysctl[] = {
.extra1 = (void *)SYSCTL_ZERO,
.extra2 = (void *)SYSCTL_ONE,
},