release kernel 5.18.15

3 files changed, 18 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff81d0ff0927..a5965ebb02c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-acs-manjaro
-	pkgver = 5.18.14
+	pkgver = 5.18.15
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -18,7 +18,7 @@ pkgbase = linux-acs-manjaro
 	makedepends = xz
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.14.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.15.xz
 	source = config
 	source = 0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch
 	source = 0102-HID_apple_Properly_handle_function_keys_on_Keychron_keyboards.patch
@@ -40,8 +40,8 @@ pkgbase = linux-acs-manjaro
 	source = 0413-bootsplash.gitpatch
 	source = 0999-acs.gitpatch
 	sha256sums = 51f3f1684a896e797182a0907299cc1f0ff5e5b51dd9a55478ae63a409855cee
-	sha256sums = ca271cc90dcfa74dab8266087cf25978bc42edc62f314f1e297bad1508c9264b
-	sha256sums = f96254613e5d880aefca492cb54a3eb65aeae92f4f82f4859ce0e359b96663ef
+	sha256sums = c5fa763f04fb1efc773f4790d24378a4c445fd1dbf8cf58ad4268583f7ef6160
+	sha256sums = 74430e266b3e4cc23c80894ef1bdb03a1e161212945c6fa223499171a23b11bf
 	sha256sums = 05f04019d4a2ee072238c32860fa80d673687d84d78ef436ae9332b6fb788467
 	sha256sums = 0586d4e1295264ab86104e19835d94d71c4b5f69edafc99d2d14a8f3322f58aa
 	sha256sums = 2b11905b63b05b25807dd64757c779da74dd4c37e36d3f7a46485b1ee5a9d326
diff --git a/PKGBUILD b/PKGBUILD
index 4fe99bcbd699..e131e62f23d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase=linux-acs-manjaro
 pkgname=('linux-acs-manjaro' 'linux-acs-manjaro-headers')
 _kernelname=-ACS-MANJARO
 _basekernel=5.18
-pkgver=5.18.14
+pkgver=5.18.15
 pkgrel=1
 arch=('x86_64')
 url="https://www.kernel.org/"
@@ -47,8 +47,8 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
         # ACS override patch
         '0999-acs.gitpatch')
 sha256sums=('51f3f1684a896e797182a0907299cc1f0ff5e5b51dd9a55478ae63a409855cee'
-            'ca271cc90dcfa74dab8266087cf25978bc42edc62f314f1e297bad1508c9264b'
-            'f96254613e5d880aefca492cb54a3eb65aeae92f4f82f4859ce0e359b96663ef'
+            'c5fa763f04fb1efc773f4790d24378a4c445fd1dbf8cf58ad4268583f7ef6160'
+            '74430e266b3e4cc23c80894ef1bdb03a1e161212945c6fa223499171a23b11bf'
             '05f04019d4a2ee072238c32860fa80d673687d84d78ef436ae9332b6fb788467'
             '0586d4e1295264ab86104e19835d94d71c4b5f69edafc99d2d14a8f3322f58aa'
             '2b11905b63b05b25807dd64757c779da74dd4c37e36d3f7a46485b1ee5a9d326'
diff --git a/config b/config
index ed8042fea11d..825b7494f486 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.8-1 Kernel Configuration
+# Linux/x86 5.18.15-1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
 CONFIG_CC_IS_GCC=y
@@ -353,9 +353,6 @@ CONFIG_X86_FEATURE_NAMES=y
 CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
-CONFIG_RETPOLINE=y
-CONFIG_CC_HAS_SLS=y
-CONFIG_SLS=y
 CONFIG_X86_CPU_RESCTRL=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_INTEL_LPSS=y
@@ -524,6 +521,16 @@ CONFIG_HAVE_LIVEPATCH=y
 # CONFIG_LIVEPATCH is not set
 # end of Processor type and features
 
+CONFIG_CC_HAS_SLS=y
+CONFIG_CC_HAS_RETURN_THUNK=y
+CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+CONFIG_RETPOLINE=y
+CONFIG_RETHUNK=y
+CONFIG_CPU_UNRET_ENTRY=y
+CONFIG_CPU_IBPB_ENTRY=y
+CONFIG_CPU_IBRS_ENTRY=y
+CONFIG_SLS=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
 
@@ -10171,7 +10178,6 @@ CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
-CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_SECURITY_INFINIBAND=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y