From a8e7c5ff8617fbda3fbc2460b860b31d25741c94 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 17 Apr 2024 19:39:14 +0200 Subject: [PATCH] kernel: update to 6.6.28 Signed-off-by: Arne Fitzenreiter --- config/kernel/kernel.config.aarch64-ipfire | 2 +- config/kernel/kernel.config.x86_64-ipfire | 6 ++---- config/rootfiles/common/x86_64/linux | 2 +- lfs/linux | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 836c48b017..b85d7add95 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.6.27-ipfire Kernel Configuration +# Linux/arm64 6.6.28-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index d36fc381c4..8ce66cb4f1 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.6.27-ipfire Kernel Configuration +# Linux/x86 6.6.28-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -510,9 +510,7 @@ CONFIG_CPU_SRSO=y CONFIG_SLS=y # CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_MITIGATION_RFDS=y -# CONFIG_SPECTRE_BHI_ON is not set -# CONFIG_SPECTRE_BHI_OFF is not set -CONFIG_SPECTRE_BHI_AUTO=y +CONFIG_MITIGATION_SPECTRE_BHI=y CONFIG_ARCH_HAS_ADD_PAGES=y # diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 7245188125..8458d510d0 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -9205,6 +9205,7 @@ etc/modprobe.d/ipv6.conf #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/MITIGATION_SPECTRE_BHI #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 @@ -10994,7 +10995,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SPARSEMEM_VMEMMAP #lib/modules/KVER-ipfire/build/include/config/SPARSEMEM_VMEMMAP_ENABLE #lib/modules/KVER-ipfire/build/include/config/SPARSE_IRQ -#lib/modules/KVER-ipfire/build/include/config/SPECTRE_BHI_AUTO #lib/modules/KVER-ipfire/build/include/config/SPECULATION_MITIGATIONS #lib/modules/KVER-ipfire/build/include/config/SPLIT_PTLOCK_CPUS #lib/modules/KVER-ipfire/build/include/config/SPMI diff --git a/lfs/linux b/lfs/linux index 0016a76f56..9cd16cb35b 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.27 +VER = 6.6.28 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 386ceee8c6f48936461a6b5a770a7ade5ebb81cf936ee3712a7ebcf6a938490d8829babe15bf7a58cc0fc64f5f0cbb6bc501d3612eab6faa9531e00c929b4bb1 +$(DL_FILE)_BLAKE2 = 688c9b46f36a0ef8dedbfe27681878216e9b11faa05bb3f8a5f257d6536df2a3260c2ecac33d67b6b1a27dfb747a86ae8911a0bc2c6376f062fd04595e05b199 install : $(TARGET) -- 2.39.5