From 8c43d1481a99743ce23d8b92879ea04f7e0153c1 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 2 Feb 2024 07:33:38 +0000 Subject: [PATCH] kernel: update to 6.6.15 Signed-off-by: Arne Fitzenreiter --- config/kernel/kernel.config.aarch64-ipfire | 6 +++--- config/kernel/kernel.config.riscv64-ipfire | 4 +--- config/kernel/kernel.config.x86_64-ipfire | 2 +- config/rootfiles/common/aarch64/linux | 2 ++ lfs/linux | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 411e95be9..04d65d6ce 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.13-ipfire Kernel Configuration +# Linux/arm64 6.6.15-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -378,7 +378,9 @@ CONFIG_ARM64_ERRATUM_2067961=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y +CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_ERRATUM_2966298=y +CONFIG_ARM64_ERRATUM_3117295=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y @@ -6859,8 +6861,6 @@ CONFIG_MMC_CQHCI=m CONFIG_MMC_BCM2835=y # CONFIG_MMC_MTK is not set # CONFIG_MMC_SDHCI_XENON is not set -# CONFIG_MMC_SDHCI_OMAP is not set -# CONFIG_MMC_SDHCI_AM654 is not set # CONFIG_SCSI_UFSHCD is not set # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire index 620854021..52a7c1c45 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.6.13-ipfire Kernel Configuration +# Linux/riscv 6.6.15-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -5820,8 +5820,6 @@ CONFIG_MMC_CQHCI=m # CONFIG_MMC_TOSHIBA_PCI is not set # CONFIG_MMC_MTK is not set CONFIG_MMC_SDHCI_XENON=m -# CONFIG_MMC_SDHCI_OMAP is not set -# CONFIG_MMC_SDHCI_AM654 is not set CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFS_BSG=y CONFIG_SCSI_UFS_CRYPTO=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 96da4cdb7..79375e954 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.13-ipfire Kernel Configuration +# Linux/x86 6.6.15-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index a32c3770e..92c4a4286 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -7263,6 +7263,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2645198 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2658417 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2966298 +#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_3117295 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_819472 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_824069 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_826319 @@ -7294,6 +7295,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_CLEAN_CACHE #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_REPEAT_TLBI #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_SPECULATIVE_AT +#lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_TSB_FLUSH_FAILURE #lib/modules/KVER-ipfire/build/include/config/ARMADA_37XX_CLK #lib/modules/KVER-ipfire/build/include/config/ARMADA_37XX_WATCHDOG diff --git a/lfs/linux b/lfs/linux index 023f48a4b..efd3e8533 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.13 +VER = 6.6.15 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1d644e48fa4fd3740712130b0d5756b75d70471cda2a7206083434ec89d288bd7487e633c8954ec038e3784d56d7a787e6cab1c93e5fbfcfc0b44a7b55b0debd +$(DL_FILE)_BLAKE2 = a630bc7b2463bdc312f8936210a54e92bbe4136fc78995c18d0ccafbcdb27cce5b7b0d4a6ba10c378e14e86855ee7e76e355acc0580f7441e4df64e7dbd8a4b7 install : $(TARGET) -- 2.39.5