[packages/kernel/LINUX_6_6] Up to 6.6; SPECTRE_BHI_ON (default on; follows upstream); fixes CVE-2024-2201

[arekm]

commit 6439cbf4b4eb56c6e5cd4a4f511a366a61490837
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Apr 12 08:38:03 2024 +0200

    Up to 6.6; SPECTRE_BHI_ON (default on; follows upstream); fixes CVE-2024-2201

 kernel-x86.config | 5 ++++-
 kernel.spec       | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index db92f4d5..32cb3280 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@
 
 %define		rel		1
 %define		basever		6.6
-%define		postver		.25
+%define		postver		.26
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	-%{basever}
@@ -115,7 +115,7 @@ Source0:	https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
 # Source0-md5:	452098d80ba925af3a4ab35998f3aef5
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5:	4db497b4bd0b3f99f81e0555e84733a8
+# Patch0-md5:	380fc1e24364b1a4cff4347bb8f1ed1e
 %endif
 Source1:	kernel.sysconfig
 
diff --git a/kernel-x86.config b/kernel-x86.config
index 00e0edad..6ece4839 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -72,7 +72,6 @@ PAGE_OFFSET i386=0xC0000000
 X86_5LEVEL x86=n
 X86_CPA_STATISTICS x86=y
 AMD_MEM_ENCRYPT x86=y
-AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT x86=y
 NUMA x86_64=y
 AMD_NUMA x86=n
 X86_64_ACPI_NUMA x86_64=y
@@ -123,6 +122,9 @@ CPU_SRSO x86_64=y
 SLS x86_64=y
 GDS_FORCE_MITIGATION x86_64=n x86=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
 #- file kernel/power/Kconfig goes here
 #- file drivers/acpi/Kconfig goes here
 APM i386=m
@@ -257,6 +259,7 @@ X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
+AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT x86=y
 BOOTPARAM_HOTPLUG_CPU0 all=n
 DEBUG_HOTPLUG_CPU0 all=n
 KEXEC_JUMP x86=y
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/6439cbf4b4eb56c6e5cd4a4f511a366a61490837