From 00aa9017fa7c1150438d607119e8ebe3437ea908 Mon Sep 17 00:00:00 2001 From: John Audia Date: Mon, 19 Aug 2024 10:57:02 -0400 Subject: [PATCH] kernel: bump 6.6 to 6.6.47 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.47 All patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/16173 Signed-off-by: Hauke Mehrtens --- include/kernel-6.6 | 4 ++-- ...950-0065-cgroup-Disable-cgroup-memory-by-default.patch | 8 ++++---- .../680-net-add-TCP-fraglist-GRO-support.patch | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 9581ac4e04..826c0c4332 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .46 -LINUX_KERNEL_HASH-6.6.46 = 052f932396d9c7d84ceeda91226a8ef797c12188bde41e6c419602d990dd45f2 +LINUX_VERSION-6.6 = .47 +LINUX_KERNEL_HASH-6.6.47 = d43376c9e9eaa92bb1b926054bd160d329c58a62d64bd65fe1222c11c6564f50 diff --git a/target/linux/bcm27xx/patches-6.6/950-0065-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/bcm27xx/patches-6.6/950-0065-cgroup-Disable-cgroup-memory-by-default.patch index 71ba361232..8a06ec387e 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0065-cgroup-Disable-cgroup-memory-by-default.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0065-cgroup-Disable-cgroup-memory-by-default.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -6051,6 +6051,9 @@ int __init cgroup_init_early(void) +@@ -6060,6 +6060,9 @@ int __init cgroup_init_early(void) return 0; } @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell /** * cgroup_init - cgroup initialization * -@@ -6084,6 +6087,12 @@ int __init cgroup_init(void) +@@ -6093,6 +6096,12 @@ int __init cgroup_init(void) cgroup_unlock(); @@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -6724,6 +6733,10 @@ static int __init cgroup_disable(char *s +@@ -6733,6 +6742,10 @@ static int __init cgroup_disable(char *s strcmp(token, ss->legacy_name)) continue; @@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell static_branch_disable(cgroup_subsys_enabled_key[i]); pr_info("Disabling %s control group subsystem\n", ss->name); -@@ -6742,6 +6755,31 @@ static int __init cgroup_disable(char *s +@@ -6751,6 +6764,31 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); diff --git a/target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch b/target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch index a321b6afc4..68ebf4e68a 100644 --- a/target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch +++ b/target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch @@ -379,7 +379,7 @@ Signe-off-by: Felix Fietkau skb_shinfo(skb)->gso_type |= SKB_GSO_TCPV4; --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c -@@ -451,33 +451,6 @@ out: +@@ -452,33 +452,6 @@ out: return segs; } -- 2.30.2