From: Arne Fitzenreiter Date: Wed, 20 Mar 2024 16:28:43 +0000 (+0100) Subject: kernel: update to 6.6.22 X-Git-Tag: v2.29-core186~151 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28796e09e5e5997d2ee9e11e3de7ca4b139d4c11;p=ipfire-2.x.git kernel: update to 6.6.22 Signed-off-by: Arne Fitzenreiter --- diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 04d65d6ce8..11a3ef593d 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,20 +1,21 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.15-ipfire Kernel Configuration +# Linux/arm64 6.6.22-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24100 +CONFIG_AS_VERSION=24200 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24100 +CONFIG_LD_VERSION=24200 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -4556,7 +4557,6 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_STMPE is not set CONFIG_MFD_SUN6I_PRCM=y CONFIG_MFD_SYSCON=y -# CONFIG_MFD_TI_AM335X_TSCADC is not set # CONFIG_MFD_LP3943 is not set # CONFIG_MFD_LP8788 is not set # CONFIG_MFD_TI_LMU is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 79375e954d..319aa2effc 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,20 +1,21 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.15-ipfire Kernel Configuration +# Linux/x86 6.6.22-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24100 +CONFIG_AS_VERSION=24200 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24100 +CONFIG_LD_VERSION=24200 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y @@ -508,6 +509,7 @@ CONFIG_CPU_IBRS_ENTRY=y CONFIG_CPU_SRSO=y CONFIG_SLS=y # CONFIG_GDS_FORCE_MITIGATION is not set +CONFIG_MITIGATION_RFDS=y CONFIG_ARCH_HAS_ADD_PAGES=y # @@ -4402,7 +4404,6 @@ CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_SKY81452 is not set CONFIG_MFD_SYSCON=y -# CONFIG_MFD_TI_AM335X_TSCADC is not set # CONFIG_MFD_LP3943 is not set # CONFIG_MFD_TI_LMU is not set # CONFIG_TPS6105X is not set diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index bb987c6508..3dcacfd4da 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -8508,6 +8508,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/GACT_PROB #lib/modules/KVER-ipfire/build/include/config/GARP #lib/modules/KVER-ipfire/build/include/config/GCC11_NO_ARRAY_BOUNDS +#lib/modules/KVER-ipfire/build/include/config/GCC_ASM_GOTO_OUTPUT_WORKAROUND #lib/modules/KVER-ipfire/build/include/config/GCC_PLUGINS #lib/modules/KVER-ipfire/build/include/config/GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS #lib/modules/KVER-ipfire/build/include/config/GCC_VERSION @@ -12464,6 +12465,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/at91.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/axi-dmac.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/dw-dmac.h +#lib/modules/KVER-ipfire/build/include/dt-bindings/dma/fsl-edma.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/jz4775-dma.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/jz4780-dma.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/nbpfaxi.h diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index ac92335157..be499ef5f3 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -8192,6 +8192,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/GACT_PROB #lib/modules/KVER-ipfire/build/include/config/GARP #lib/modules/KVER-ipfire/build/include/config/GCC11_NO_ARRAY_BOUNDS +#lib/modules/KVER-ipfire/build/include/config/GCC_ASM_GOTO_OUTPUT_WORKAROUND #lib/modules/KVER-ipfire/build/include/config/GCC_PLUGINS #lib/modules/KVER-ipfire/build/include/config/GCC_VERSION #lib/modules/KVER-ipfire/build/include/config/GENERIC_ALLOCATOR @@ -9203,6 +9204,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/MISC_RTSX #lib/modules/KVER-ipfire/build/include/config/MISC_RTSX_PCI #lib/modules/KVER-ipfire/build/include/config/MISC_RTSX_USB +#lib/modules/KVER-ipfire/build/include/config/MITIGATION_RFDS #lib/modules/KVER-ipfire/build/include/config/MLX4_CORE #lib/modules/KVER-ipfire/build/include/config/MLX4_CORE_GEN2 #lib/modules/KVER-ipfire/build/include/config/MLX4_EN @@ -12483,6 +12485,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/at91.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/axi-dmac.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/dw-dmac.h +#lib/modules/KVER-ipfire/build/include/dt-bindings/dma/fsl-edma.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/jz4775-dma.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/jz4780-dma.h #lib/modules/KVER-ipfire/build/include/dt-bindings/dma/nbpfaxi.h diff --git a/lfs/linux b/lfs/linux index 962e08c7e8..369e94dc1a 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.15 +VER = 6.6.22 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = a630bc7b2463bdc312f8936210a54e92bbe4136fc78995c18d0ccafbcdb27cce5b7b0d4a6ba10c378e14e86855ee7e76e355acc0580f7441e4df64e7dbd8a4b7 +$(DL_FILE)_BLAKE2 = cea542524dbaea79c27e602b3e0534b5b95243ded95abdcab48f7ab1daf5f6de7231b24d2bc42e52fa27f98be9237534fb92f27ff1ba847df72e363b6147d3ab install : $(TARGET)