From: Marcin Krol <hawk@tld-linux.org>
Date: Mon, 6 May 2024 23:12:49 +0000 (+0200)
Subject: - updated to 5.15.158
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=554391477d1f4d0d9fe0daf369c5aae91fb4c0bb;p=packages%2Fkernel.git

- updated to 5.15.158
---

diff --git a/kernel-x86.config b/kernel-x86.config
index 552ec9d..b14e91b 100644
--- 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 ef66c43..0c20cae 100644
--- 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 318302b..2845f2e 100644
--- 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