From: John Audia Date: Tue, 9 Jul 2024 20:20:30 +0000 (-0400) Subject: kernel: bump 6.6 to 6.6.38 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=df1c85956abecedb34e48edd5fd8ad9b03d818c1;p=openwrt%2Fstaging%2Fxback.git kernel: bump 6.6 to 6.6.38 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.38 Removed target/linux/generic/hack-6.6/900-fix-build-to-handle-return-value.patch which was introduced as a hacky attempt to fix an upstream issue related to 6.6.37. 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/15879 Signed-off-by: Hauke Mehrtens --- diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 9661cd01d0..ebd26db32b 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .37 -LINUX_KERNEL_HASH-6.6.37 = f3976e77708694fe4a1f8d1307c315c8a36cbc58f038a38e006b91e29a1f3214 +LINUX_VERSION-6.6 = .38 +LINUX_KERNEL_HASH-6.6.38 = 4ed403ffb550565d03485aeca9a52c128cdde43f4a373a1a9ee3a590524fe743 diff --git a/target/linux/generic/hack-6.6/900-fix-build-to-handle-return-value.patch b/target/linux/generic/hack-6.6/900-fix-build-to-handle-return-value.patch deleted file mode 100644 index b1b2bc9b95..0000000000 --- a/target/linux/generic/hack-6.6/900-fix-build-to-handle-return-value.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/arch/arm64/net/bpf_jit_comp.c -+++ b/arch/arm64/net/bpf_jit_comp.c -@@ -1526,6 +1526,7 @@ struct bpf_prog *bpf_int_jit_compile(str - bool extra_pass = false; - struct jit_ctx ctx; - u8 *image_ptr; -+ int ret; - - if (!prog->jit_requested) - return orig_prog; -@@ -1648,7 +1649,7 @@ skip_init_ctx: - prog->jited_len = 0; - goto out_off; - } -- bpf_jit_binary_lock_ro(header); -+ ret = bpf_jit_binary_lock_ro(header); - } else { - jit_data->ctx = ctx; - jit_data->image = image_ptr;