commit 1b9e891707c1195d9d317bec6a927a5e3d4d756b Author: Arkadiusz MiĆkiewicz <ar...@maven.pl> Date: Sat Apr 20 00:44:16 2024 +0200
Up to 6.1.87. kernel-x86.config | 7 ++++--- kernel.spec | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) --- diff --git a/kernel.spec b/kernel.spec index 9a743e90..eafb984c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ %define rel 1 %define basever 6.1 -%define postver .86 +%define postver .87 # define this to '-%{basever}' for longterm branch %define versuffix -%{basever} @@ -121,7 +121,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz # Source0-md5: 475320de08f16c9fa486fc4edfe98b30 %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz -# Patch0-md5: 875581b5532bdcaf6dee591711794b20 +# Patch0-md5: 35bc7525c3b985d21ac3184d44b30f51 %endif Source1: kernel.sysconfig diff --git a/kernel-x86.config b/kernel-x86.config index 27c6ce1b..0735d4db 100644 --- a/kernel-x86.config +++ b/kernel-x86.config @@ -127,9 +127,7 @@ CPU_SRSO x86_64=y SLS x86_64=y GDS_FORCE_MITIGATION x86_64=n MITIGATION_RFDS x86_64=y -SPECTRE_BHI_ON x86=y x86_64=y -SPECTRE_BHI_OFF x86=n x86_64=n -SPECTRE_BHI_AUTO x86=n x86_64=n +MITIGATION_SPECTRE_BHI x86=y x86_64=y #- file kernel/power/Kconfig goes here #- file drivers/acpi/Kconfig goes here APM i386=m @@ -264,3 +262,6 @@ X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y #- *** PROBABLY REMOVED OPTIONS *** #- AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT x86=y +SPECTRE_BHI_AUTO x86=n x86_64=n +SPECTRE_BHI_OFF x86=n x86_64=n +SPECTRE_BHI_ON x86=y x86_64=y ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/1b9e891707c1195d9d317bec6a927a5e3d4d756b _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit