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

- updated to 6.1.90
---

diff --git a/kernel-x86.config b/kernel-x86.config
index d2b53f8..05fe774 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.89 Kernel Configuration
+# Linux/x86 6.1.90 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 13.2.0 20240401 (release)"
 CONFIG_CC_IS_GCC=y
@@ -486,7 +486,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
@@ -707,6 +707,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 85f6317..2413cf5 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.89 Kernel Configuration
+# Linux/x86 6.1.90 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 13.2.0 20240401 (release)"
 CONFIG_CC_IS_GCC=y
@@ -498,7 +498,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
@@ -713,6 +713,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 d5e61de..cb26be3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -4,7 +4,7 @@
 %bcond_with	verbose		# verbose build (V=1)
 
 %define		basever		6.1
-%define		postver		89
+%define		postver		90
 %define		rel		1
 
 %define		__alt_kernel	%{nil}
@@ -36,7 +36,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
 # Source0-md5:	475320de08f16c9fa486fc4edfe98b30
 %if "%{postver}" != "0"
 Source1:	http://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Source1-md5:	028cfb5da4edf3490c7798e547862592
+# Source1-md5:	d20d222444bb67d2ed4362e5eb5fe1c3
 %endif
 
 Source2:	kernel-module-build.pl