diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-08-15 10:00:08 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-08-15 10:00:08 +0200 |
| commit | 9523fb1a1d4a000bc0c73dda4aeb2ca633270627 (patch) | |
| tree | 6fab9e4a09882e7c8b4c5a651bb7296a16e2ddf5 | |
| parent | 35909ca30cd2bb2906e0417489737fd24157b904 (diff) | |
| parent | 4e73d05516516597a48ebcdf92e3c372deb51f28 (diff) | |
| download | vyos-build-9523fb1a1d4a000bc0c73dda4aeb2ca633270627.tar.gz vyos-build-9523fb1a1d4a000bc0c73dda4aeb2ca633270627.zip | |
Merge branch 'vyos:sagitta' into sagitta
| -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 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, }, |