- updated to 5.15.158

diff --git a/kernel-x86.config b/kernel-x86.config
index 552ec9d18d2078bbd3c923edf89f7840ae2593ac..b14e91b84bf358443ca2aae9993f412e4806c356 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.157 Kernel Configuration
+# Linux/x86 5.15.158 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 13.2.0 20240401 (release)"
 CONFIG_CC_IS_GCC=y
@@ -481,7 +481,7 @@ CONFIG_MODIFY_LDT_SYSCALL=y
 
 CONFIG_CC_HAS_SLS=y
 CONFIG_CC_HAS_RETURN_THUNK=y
-CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_CPU_MITIGATIONS=y
 CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_RETPOLINE=y
 CONFIG_RETHUNK=y
@@ -698,6 +698,7 @@ CONFIG_AS_AVX512=y
 CONFIG_AS_SHA1_NI=y
 CONFIG_AS_SHA256_NI=y
 CONFIG_AS_TPAUSE=y
+CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
 
 #
 # General architecture-dependent options

diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index ef66c432a74d11f9497f46fe6c0a065cb09bad2b..0c20caef693621383ed01d05710b30f964db436e 100644 (file)
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.157 Kernel Configuration
+# Linux/x86 5.15.158 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 13.2.0 20240401 (release)"
 CONFIG_CC_IS_GCC=y
@@ -496,7 +496,7 @@ CONFIG_HAVE_LIVEPATCH=y
 
 CONFIG_CC_HAS_SLS=y
 CONFIG_CC_HAS_RETURN_THUNK=y
-CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_CPU_MITIGATIONS=y
 CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_RETPOLINE=y
 CONFIG_RETHUNK=y
@@ -706,6 +706,7 @@ CONFIG_AS_AVX512=y
 CONFIG_AS_SHA1_NI=y
 CONFIG_AS_SHA256_NI=y
 CONFIG_AS_TPAUSE=y
+CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
 
 #
 # General architecture-dependent options

diff --git a/kernel.spec b/kernel.spec
index 318302b2422449eccf7bb957deb61516b781733a..2845f2ef613d95d7b63c4cae05eeeb863c6a0411 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -4,7 +4,7 @@
 %bcond_with    verbose         # verbose build (V=1)
 
 %define                basever         5.15
-%define                postver         157
+%define                postver         158
 %define                rel             1
 
 %define                __alt_kernel    %{nil}
@@ -36,7 +36,7 @@ Source0:      http://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: 071d49ff4e020d58c04f9f3f76d3b594
 %if "%{postver}" != "0"
 Source1:       http://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Source1-md5: 812bb1cf31d7c31ac4d4b6e881dc277f
+# Source1-md5: 5b1dcbfc05b72def1f1658a27ad696e4
 %endif
 
 Source2:       kernel-module-build.pl