From 9d95934289facdf7b539a2ae60cbb24a7d5df84c Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 10 Apr 2024 15:16:18 -0400 Subject: kernel: bump 6.6 to 6.6.26 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.26 Manually rebased: generic/hack-6.6/210-darwin_scripts_include.patch Added pending: generic/pending-6.6/981-gcc-plugins-stackleak-Avoid-.head.txt.section.patch All other patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, flogic/glinet_gl-mt6000 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, flogic/glinet_gl-mt6000 Signed-off-by: John Audia --- .../patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/ipq40xx/patches-6.6') diff --git a/target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch b/target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch index 9257f916ca..a45c41ea9a 100644 --- a/target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch +++ b/target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch @@ -93,7 +93,7 @@ Signed-off-by: Maxime Chevallier +#endif --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -4637,6 +4637,9 @@ enum skb_ext_id { +@@ -4632,6 +4632,9 @@ enum skb_ext_id { #if IS_ENABLED(CONFIG_MCTP_FLOWS) SKB_EXT_MCTP, #endif -- cgit v1.2.3