diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-03-03 09:49:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-03 09:49:06 +0100 |
| commit | d42f7e8a9e79daf7c58b9edaa680de5183dd8116 (patch) | |
| tree | 79b9a00d1215d3bf1577a472dfe3d69611daefa1 | |
| parent | 65260b18ee3078c88526a90607421ab5b516edf1 (diff) | |
| parent | 75cedec6c650f68002b9f55c6661290c20438884 (diff) | |
| download | vyos-build-d42f7e8a9e79daf7c58b9edaa680de5183dd8116.tar.gz vyos-build-d42f7e8a9e79daf7c58b9edaa680de5183dd8116.zip | |
Merge pull request #521 from vyos/kernel-update
Kernel: T5887: update Linux Kernel to v6.6.19 (backport)
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index c75c3e32..29db3cdb 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.17" +kernel_version = "6.6.19" 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 9c79e4f5..3987d630 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 @@ -88,10 +88,10 @@ index cf592d7b630f..e8915701aa73 100644 }; diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c -index ca0ff15dc8fa..67a55fec5b29 100644 +index bc74f131fe4d..9cdd5b50f9b2 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c -@@ -2582,6 +2582,7 @@ static struct devinet_sysctl_table { +@@ -2595,6 +2595,7 @@ static struct devinet_sysctl_table { "route_localnet"), DEVINET_SYSCTL_FLUSHING_ENTRY(DROP_UNICAST_IN_L2_MULTICAST, "drop_unicast_in_l2_multicast"), @@ -100,10 +100,10 @@ index ca0ff15dc8fa..67a55fec5b29 100644 }; diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c -index b007d098ffe2..865d7be4fd29 100644 +index 7881446a46c4..f3c7a2e0902d 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -5639,6 +5639,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, +@@ -5654,6 +5654,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 b007d098ffe2..865d7be4fd29 100644 } static inline size_t inet6_ifla6_size(void) -@@ -7067,6 +7068,13 @@ static const struct ctl_table addrconf_sysctl[] = { +@@ -7082,6 +7083,13 @@ static const struct ctl_table addrconf_sysctl[] = { .extra1 = (void *)SYSCTL_ZERO, .extra2 = (void *)SYSCTL_ONE, }, |