From: Arne Fitzenreiter Date: Fri, 18 Apr 2025 10:01:26 +0000 (+0200) Subject: kernel: update to 6.12.23 X-Git-Tag: v2.29-core194~13^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=953db9f94ada76c517aec76622938a66cc3c468f;p=ipfire-2.x.git kernel: update to 6.12.23 Signed-off-by: Arne Fitzenreiter --- diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index ed0782ec9..f5837f41f 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.21 Kernel Configuration +# Linux/arm64 6.12.23 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y @@ -20,6 +20,7 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y +CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 03a9d9817..fbe89b820 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.12.21 Kernel Configuration +# Linux/x86 6.12.23 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0" CONFIG_CC_IS_GCC=y @@ -20,6 +20,7 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y +CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -1878,8 +1879,6 @@ CONFIG_ETHTOOL_NETLINK=y # # Device Drivers # -CONFIG_HAVE_EISA=y -# CONFIG_EISA is not set CONFIG_HAVE_PCI=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_PCI=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index ca6847ca2..88c528557 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -9546,6 +9546,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/LCD_CLASS_DEVICE #lib/modules/KVER/build/include/config/LCD_PLATFORM #lib/modules/KVER/build/include/config/LDM_PARTITION +#lib/modules/KVER/build/include/config/LD_CAN_USE_KEEP_IN_OVERLAY #lib/modules/KVER/build/include/config/LD_IS_BFD #lib/modules/KVER/build/include/config/LD_ORPHAN_WARN #lib/modules/KVER/build/include/config/LD_ORPHAN_WARN_LEVEL diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 845f28b51..aeb8ce71b 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -8582,7 +8582,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/HAVE_DYNAMIC_FTRACE_WITH_REGS #lib/modules/KVER/build/include/config/HAVE_EBPF_JIT #lib/modules/KVER/build/include/config/HAVE_EFFICIENT_UNALIGNED_ACCESS -#lib/modules/KVER/build/include/config/HAVE_EISA #lib/modules/KVER/build/include/config/HAVE_EXIT_THREAD #lib/modules/KVER/build/include/config/HAVE_FENTRY #lib/modules/KVER/build/include/config/HAVE_FTRACE_MCOUNT_RECORD @@ -9223,6 +9222,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER/build/include/config/LCD_CLASS_DEVICE #lib/modules/KVER/build/include/config/LCD_PLATFORM #lib/modules/KVER/build/include/config/LDM_PARTITION +#lib/modules/KVER/build/include/config/LD_CAN_USE_KEEP_IN_OVERLAY #lib/modules/KVER/build/include/config/LD_IS_BFD #lib/modules/KVER/build/include/config/LD_ORPHAN_WARN #lib/modules/KVER/build/include/config/LD_ORPHAN_WARN_LEVEL diff --git a/lfs/linux b/lfs/linux index 5317a4965..f1a436c03 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.12.21 +VER = 6.12.23 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -69,7 +69,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3dad715ed88f08c680837f7f74d0cb759f1a50f597820a9885863fba48cc13b10d4efa65ad821c02cfbbd7f0b814f4498cf15f4274cd9249b49edd5a37ea0728 +$(DL_FILE)_BLAKE2 = 794c7fead01abd6e8e93e8f22e4b1c7b443bff8749445a4759d323f20534040cbe827d42ab47bd9af57f70309f91c92577ea655ed5de2a4035dda9aea8096add install : $(TARGET)