From 0528c84cc445c0fafe9312da9958d1c581a044c4 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 11 Apr 2024 13:25:07 +0000 Subject: [PATCH 1/2] linux: update to 6.6.26 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index e10fe831ca..76aee171f1 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -29,8 +29,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; *) - PKG_VERSION="6.6.25" - PKG_SHA256="99d210be87908233a55b0fadc0dccd3b95926c0651b6b82e37350b2029de1f44" + PKG_VERSION="6.6.26" + PKG_SHA256="af54b449f4fb93b8e8daa346144a7309e8e95174bd962c4b5917cf56120456d9" PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS="default" ;; From ed011778c3d60e4e84ff1dd81fbc5d5d764711c8 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 11 Apr 2024 14:01:53 +0000 Subject: [PATCH 2/2] linux (Generic): 6.6.26 SPECTRE_BHI_AUTO=y --- projects/Generic/linux/linux.x86_64.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 1bad322560..8b4b147fbb 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.22 Kernel Configuration +# Linux/x86 6.6.26 Kernel Configuration # CONFIG_CC_VERSION_TEXT="x86_64-libreelec-linux-gnu-gcc-13.2.0 (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -501,6 +501,9 @@ CONFIG_CPU_SRSO=y # CONFIG_SLS is not set # 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_ARCH_HAS_ADD_PAGES=y #