[packages/kernel/LINUX_5_15] Up to 5.15.158

[arekm]

commit bb51670a8d6f913af8333d1cacb445801dc0c524
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri May 10 00:14:17 2024 +0200

    Up to 5.15.158

 kernel-x86.config | 7 ++++---
 kernel.spec       | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index cb6f3d88..93fedb1f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
 
 %define		rel		1
 %define		basever		5.15
-%define		postver		.157
+%define		postver		.158
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	-%{basever}
@@ -121,7 +121,7 @@ Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5:	071d49ff4e020d58c04f9f3f76d3b594
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	812bb1cf31d7c31ac4d4b6e881dc277f
+# Patch0-md5:	5b1dcbfc05b72def1f1658a27ad696e4
 %endif
 Source1:	kernel.sysconfig
 
diff --git a/kernel-x86.config b/kernel-x86.config
index 4c957163..2d611dde 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -104,14 +104,12 @@ LEGACY_VSYSCALL_XONLY all=y
 LEGACY_VSYSCALL_NONE all=n
 CMDLINE_BOOL x86=n
 #- file kernel/livepatch/Kconfig goes here
+CPU_MITIGATIONS x86=y x86_64=y
 RETPOLINE x86=y
 SLS x86=y
 GDS_FORCE_MITIGATION all=n
 MITIGATION_RFDS x86_64=y
 MITIGATION_SPECTRE_BHI x86=y 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
@@ -233,4 +231,7 @@ X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
 EFI_CAPSULE_QUIRK_QUARK_CSH i386=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
 X86_RESERVE_LOW x86=64
================================================================

---- gitweb:

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