[packages/kernel/LINUX_6_1] Up to 6.1.85; fixes CVE-2024-2201

[arekm]

commit ede2f483ff5e517a738d665af9790b35c5700faf
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Apr 12 08:46:59 2024 +0200

    Up to 6.1.85; fixes CVE-2024-2201

 kernel-x86.config | 9 ++++++++-
 kernel.spec       | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index f652f586..70634402 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
 
 %define		rel		1
 %define		basever		6.1
-%define		postver		.83
+%define		postver		.85
 
 # 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:	7dfd57b75a1d01e25919767dacfd8251
+# Patch0-md5:	ed04147b5c3db9d8a08449893adcc027
 %endif
 Source1:	kernel.sysconfig
 
diff --git a/kernel-x86.config b/kernel-x86.config
index 0f32b173..27c6ce1b 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -74,7 +74,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
@@ -128,6 +127,9 @@ 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
 #- file kernel/power/Kconfig goes here
 #- file drivers/acpi/Kconfig goes here
 APM i386=m
@@ -257,3 +259,8 @@ X86_LONGHAUL i386=m
 X86_E_POWERSAVER i386=m
 #- shared options
 X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT x86=y
================================================================

---- gitweb:

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