- updated to 6.6.30

diff --git a/kernel-x86.config b/kernel-x86.config
index c55d3a32c89265c7ca143f260c4cd20607ce471f..76b73a2073f7a373b4785b97e6f2c8ca5fd8658f 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
 #
 # Automatically generated file; DO NOT EDIT.

-# Linux/x86 6.6.29 Kernel Configuration
+# Linux/x86 6.6.30 Kernel Configuration

 #
 CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 13.2.0 20240401 (release)"
 CONFIG_CC_IS_GCC=y
 #
 CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 13.2.0 20240401 (release)"
 CONFIG_CC_IS_GCC=y


@@ -493,7 +493,7 @@ CONFIG_CC_HAS_RETURN_THUNK=y
 CONFIG_CC_HAS_ENTRY_PADDING=y
 CONFIG_FUNCTION_PADDING_CFI=0
 CONFIG_FUNCTION_PADDING_BYTES=4
 CONFIG_CC_HAS_ENTRY_PADDING=y
 CONFIG_FUNCTION_PADDING_CFI=0
 CONFIG_FUNCTION_PADDING_BYTES=4

-CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_CPU_MITIGATIONS=y

 CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_RETPOLINE=y
 CONFIG_RETHUNK=y
 CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_RETPOLINE=y
 CONFIG_RETHUNK=y


@@ -718,6 +718,7 @@ CONFIG_AS_SHA256_NI=y
 CONFIG_AS_TPAUSE=y
 CONFIG_AS_GFNI=y
 CONFIG_AS_WRUSS=y
 CONFIG_AS_TPAUSE=y
 CONFIG_AS_GFNI=y
 CONFIG_AS_WRUSS=y

+CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y

 
 #
 # General architecture-dependent options
 
 #
 # General architecture-dependent options

diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index ecb59caf42583cc927318af039985cf546c7abc6..fb5fc8dde529e44ed32325d8addbc5f234e02c79 100644 (file)
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
 #
 # Automatically generated file; DO NOT EDIT.

-# Linux/x86 6.6.29 Kernel Configuration
+# Linux/x86 6.6.30 Kernel Configuration

 #
 CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 13.2.0 20240401 (release)"
 CONFIG_CC_IS_GCC=y
 #
 CONFIG_CC_VERSION_TEXT="gcc (TLD-Linux) 13.2.0 20240401 (release)"
 CONFIG_CC_IS_GCC=y


@@ -521,7 +521,7 @@ CONFIG_CALL_PADDING=y
 CONFIG_HAVE_CALL_THUNKS=y
 CONFIG_CALL_THUNKS=y
 CONFIG_PREFIX_SYMBOLS=y
 CONFIG_HAVE_CALL_THUNKS=y
 CONFIG_CALL_THUNKS=y
 CONFIG_PREFIX_SYMBOLS=y

-CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_CPU_MITIGATIONS=y

 CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_RETPOLINE=y
 CONFIG_RETHUNK=y
 CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_RETPOLINE=y
 CONFIG_RETHUNK=y


@@ -743,6 +743,7 @@ CONFIG_AS_SHA256_NI=y
 CONFIG_AS_TPAUSE=y
 CONFIG_AS_GFNI=y
 CONFIG_AS_WRUSS=y
 CONFIG_AS_TPAUSE=y
 CONFIG_AS_GFNI=y
 CONFIG_AS_WRUSS=y

+CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y

 
 #
 # General architecture-dependent options
 
 #
 # General architecture-dependent options

diff --git a/kernel.spec b/kernel.spec
index 7a1ace4090d00668504f0e651c9b4897071f09f8..5ba59e11e3d4878534ec949192f91608afcd0efe 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -4,7 +4,7 @@
 %bcond_with    verbose         # verbose build (V=1)
 
 %define                basever         6.6
 %bcond_with    verbose         # verbose build (V=1)
 
 %define                basever         6.6

-%define                postver         29
+%define                postver         30

 %define                rel             1
 
 %define                __alt_kernel    %{nil}
 %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: 452098d80ba925af3a4ab35998f3aef5
 %if "%{postver}" != "0"
 Source1:       http://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
 # Source0-md5: 452098d80ba925af3a4ab35998f3aef5
 %if "%{postver}" != "0"
 Source1:       http://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz

-# Source1-md5: 6a0119ebd50d56c72146e073db085f6d
+# Source1-md5: 6b647f5c319eb30931edfe7235e336ba

 %endif
 
 Source2:       kernel-module-build.pl
 %endif
 
 Source2:       kernel-module-build.pl