From 162a0684483a0159b4d069b651ada02f03c14fec Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 11 Aug 2023 23:25:37 +0200 Subject: [PATCH] kernel: update to 6.1.45 Signed-off-by: Arne Fitzenreiter --- config/kernel/kernel.config.aarch64-ipfire | 3 ++- config/kernel/kernel.config.x86_64-ipfire | 5 ++++- config/rootfiles/common/aarch64/linux | 2 +- config/rootfiles/common/x86_64/linux | 3 ++- lfs/linux | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 830d9db9be..74dec85650 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.1.41-ipfire Kernel Configuration +# Linux/arm64 6.1.45-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y @@ -336,6 +336,7 @@ CONFIG_ARCH_VEXPRESS=y # # ARM errata workarounds via the alternatives framework # +CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y CONFIG_ARM64_ERRATUM_826319=y CONFIG_ARM64_ERRATUM_827319=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index a5ad9700f5..7c052fe088 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.1.42-ipfire Kernel Configuration +# Linux/x86 6.1.45-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y @@ -478,7 +478,9 @@ CONFIG_RETHUNK=y CONFIG_CPU_UNRET_ENTRY=y CONFIG_CPU_IBPB_ENTRY=y CONFIG_CPU_IBRS_ENTRY=y +CONFIG_CPU_SRSO=y CONFIG_SLS=y +# CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y @@ -689,6 +691,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_NO_INSTR=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 230e419d3f..5ed37b7e03 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -6587,7 +6587,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/asm-generic/bitops/sched.h #lib/modules/KVER-ipfire/build/include/asm-generic/bitsperlong.h #lib/modules/KVER-ipfire/build/include/asm-generic/bug.h -#lib/modules/KVER-ipfire/build/include/asm-generic/bugs.h #lib/modules/KVER-ipfire/build/include/asm-generic/cache.h #lib/modules/KVER-ipfire/build/include/asm-generic/cacheflush.h #lib/modules/KVER-ipfire/build/include/asm-generic/checksum.h @@ -6767,6 +6766,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/AMD8111_ETH #lib/modules/KVER-ipfire/build/include/config/AMD_PHY #lib/modules/KVER-ipfire/build/include/config/AMLOGIC_THERMAL +#lib/modules/KVER-ipfire/build/include/config/AMPERE_ERRATUM_AC03_CPU_38 #lib/modules/KVER-ipfire/build/include/config/APERTURE_HELPERS #lib/modules/KVER-ipfire/build/include/config/AQTION #lib/modules/KVER-ipfire/build/include/config/AQUANTIA_PHY diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 3db69b01c6..f2b488ef91 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -6422,7 +6422,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/asm-generic/bitops/sched.h #lib/modules/KVER-ipfire/build/include/asm-generic/bitsperlong.h #lib/modules/KVER-ipfire/build/include/asm-generic/bug.h -#lib/modules/KVER-ipfire/build/include/asm-generic/bugs.h #lib/modules/KVER-ipfire/build/include/asm-generic/cache.h #lib/modules/KVER-ipfire/build/include/asm-generic/cacheflush.h #lib/modules/KVER-ipfire/build/include/asm-generic/checksum.h @@ -6659,6 +6658,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_ADD_PAGES #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_CACHE_LINE_SIZE #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_COPY_MC +#lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_CPU_FINALIZE_INIT #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_CPU_RELAX #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_CURRENT_STACK_POINTER #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_DEBUG_VIRTUAL @@ -7113,6 +7113,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/CPU_IDLE_GOV_TEO #lib/modules/KVER-ipfire/build/include/config/CPU_ISOLATION #lib/modules/KVER-ipfire/build/include/config/CPU_RMAP +#lib/modules/KVER-ipfire/build/include/config/CPU_SRSO #lib/modules/KVER-ipfire/build/include/config/CPU_SUP_AMD #lib/modules/KVER-ipfire/build/include/config/CPU_SUP_CENTAUR #lib/modules/KVER-ipfire/build/include/config/CPU_SUP_HYGON diff --git a/lfs/linux b/lfs/linux index 2160482ca5..52f1fe167a 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.1.42 +VER = 6.1.45 ARM_PATCHES = 6.1.y-ipfire2 THISAPP = linux-$(VER) @@ -75,7 +75,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_BLAKE2 = 27d506867a44764ca5fb71d36a1732ded064b8d24d2d53bd1b2158db53cc82283a390b46071ed0cd07fdd68a0fd60486e5ec231fc6247f87bc0bea9692d449f9 +$(DL_FILE)_BLAKE2 = 1889f12c4bf9d09a5c3d3addbe5de7989ebacdc89c01973b33e8e11faa989eb7a0f1666c3a78ffeb6b315ec1599ab51490a97079f2d4c2109c8888a88dcf03b7 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3 install : $(TARGET) -- 2.39.5