From 163d99b58cb5a81e799eb3aa375525c336a55feb Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 11 May 2025 00:57:16 +0200 Subject: [PATCH] linux6.12: update to 6.12.28. --- srcpkgs/linux6.12/files/arm64-dotconfig | 2 +- srcpkgs/linux6.12/files/i386-dotconfig | 2 +- .../Fix-BPF_INTERNAL-namespace-import.patch | 35 ------------------- srcpkgs/linux6.12/template | 2 +- 4 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/linux6.12/patches/Fix-BPF_INTERNAL-namespace-import.patch diff --git a/srcpkgs/linux6.12/files/arm64-dotconfig b/srcpkgs/linux6.12/files/arm64-dotconfig index 2fd88def258..2e5fc3400c7 100644 --- a/srcpkgs/linux6.12/files/arm64-dotconfig +++ b/srcpkgs/linux6.12/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.26 Kernel Configuration +# Linux/arm64 6.12.28 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 14.2.1 20250405" CONFIG_CC_IS_GCC=y diff --git a/srcpkgs/linux6.12/files/i386-dotconfig b/srcpkgs/linux6.12/files/i386-dotconfig index 5c9117fae62..6e36e551f16 100644 --- a/srcpkgs/linux6.12/files/i386-dotconfig +++ b/srcpkgs/linux6.12/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.12.26 Kernel Configuration +# Linux/i386 6.12.28 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405" CONFIG_CC_IS_GCC=y diff --git a/srcpkgs/linux6.12/patches/Fix-BPF_INTERNAL-namespace-import.patch b/srcpkgs/linux6.12/patches/Fix-BPF_INTERNAL-namespace-import.patch deleted file mode 100644 index b56f63800af..00000000000 --- a/srcpkgs/linux6.12/patches/Fix-BPF_INTERNAL-namespace-import.patch +++ /dev/null @@ -1,35 +0,0 @@ -The commit cdd30ebb1b9f ("module: Convert symbol namespace to string -literal") makes the grammar of MODULE_IMPORT_NS and EXPORT_SYMBOL_NS -different between the stable branches and the mainline. But when -the commit 955f9ede52b8 ("bpf: Add namespace to BPF internal symbols") -was backported from mainline, only EXPORT_SYMBOL_NS instances are -adapted, leaving the MODULE_IMPORT_NS instance with the "new" grammar -and causing the module fails to build: - - ERROR: modpost: module bpf_preload uses symbol bpf_link_get_from_fd from namespace BPF_INTERNAL, but does not import it. - ERROR: modpost: module bpf_preload uses symbol kern_sys_bpf from namespace BPF_INTERNAL, but does not import it. - -Reported-by: Mingcong Bai -Reported-by: Alex Davis -Closes: https://lore.kernel.org/all/CADiockBKBQTVqjA5G+RJ9LBwnEnZ8o0odYnL=LBZ_7QN=_SZ7A@mail.gmail.com/ -Fixes: 955f9ede52b8 ("bpf: Add namespace to BPF internal symbols") -Signed-off-by: Xi Ruoyao ---- - kernel/bpf/preload/bpf_preload_kern.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/bpf/preload/bpf_preload_kern.c b/kernel/bpf/preload/bpf_preload_kern.c -index 56a81df7a9d7..fdad0eb308fe 100644 ---- a/kernel/bpf/preload/bpf_preload_kern.c -+++ b/kernel/bpf/preload/bpf_preload_kern.c -@@ -89,5 +89,5 @@ static void __exit fini(void) - } - late_initcall(load); - module_exit(fini); --MODULE_IMPORT_NS("BPF_INTERNAL"); -+MODULE_IMPORT_NS(BPF_INTERNAL); - MODULE_LICENSE("GPL"); --- -2.49.0 - - diff --git a/srcpkgs/linux6.12/template b/srcpkgs/linux6.12/template index 2733d5d3d6f..28039ac182f 100644 --- a/srcpkgs/linux6.12/template +++ b/srcpkgs/linux6.12/template @@ -1,6 +1,6 @@ # Template file for 'linux6.12' pkgname=linux6.12 -version=6.12.26 +version=6.12.28 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Duncaen "