From 7861a25030626809e7805a22b8bfa535e48d322f Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev>
Date: Sat, 23 Jul 2022 18:43:02 +0200
Subject: [PATCH] 5.18.14-1

---
 .SRCINFO | 10 +++++-----
 PKGBUILD |  8 ++++----
 config   | 16 +++++++++++-----
 3 files changed, 20 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 .SRCINFO

diff --git a/.SRCINFO b/.SRCINFO
old mode 100755
new mode 100644
index 8ecdd7f..3741fe1
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-cachyos
 	pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
-	pkgver = 5.18.13
+	pkgver = 5.18.14
 	pkgrel = 1
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
@@ -21,15 +21,15 @@ pkgbase = linux-cachyos
 	makedepends = make
 	makedepends = patch
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.13.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.14.tar.xz
 	source = config
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-bore-sched.patch
-	sha256sums = 430e1affe62fcca274f217b150290995a33ceb0d5ad5e72ca6ee8a2d28276bda
-	sha256sums = b275b38abee79f05cd8f03d1284dd1faf498867e9ecf54ea9a7784afb36efe20
+	sha256sums = e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af
+	sha256sums = a8f920b542bedb7aa1d04ac5d98f12fcec21d1f51c6ca9ee2196595223f12df8
 	sha256sums = ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f
-	sha256sums = 6578c745064c71ba0fb9d59fd4b4d224516368607241f5613fad05c44f2ae842
+	sha256sums = dad2f4373faaa6b806b8de60cebe18d59ce54c1d381317cc98eba6c19ef20e66
 	sha256sums = 7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271
 
 pkgname = linux-cachyos
diff --git a/PKGBUILD b/PKGBUILD
index 408fa61..c46ba25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -132,7 +132,7 @@ else
     pkgbase=linux-$pkgsuffix
 fi
 _major=5.18
-_minor=13
+_minor=14
 #_minorc=$((_minor+1))
 #_rcver=rc8
 pkgver=${_major}.${_minor}
@@ -863,8 +863,8 @@ for _p in "${pkgname[@]}"; do
     }"
 done
 
-sha256sums=('430e1affe62fcca274f217b150290995a33ceb0d5ad5e72ca6ee8a2d28276bda'
-            'b275b38abee79f05cd8f03d1284dd1faf498867e9ecf54ea9a7784afb36efe20'
+sha256sums=('e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af'
+            'a8f920b542bedb7aa1d04ac5d98f12fcec21d1f51c6ca9ee2196595223f12df8'
             'ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f'
-            '6578c745064c71ba0fb9d59fd4b4d224516368607241f5613fad05c44f2ae842'
+            'dad2f4373faaa6b806b8de60cebe18d59ce54c1d381317cc98eba6c19ef20e66'
             '7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271')
diff --git a/config b/config
index b6a3e3f..e029a95 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.13 Kernel Configuration
+# Linux/x86 5.18.14 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
 CONFIG_CC_IS_GCC=y
@@ -371,9 +371,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 is not set
 CONFIG_X86_CPU_RESCTRL=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_INTEL_LPSS=y
@@ -586,6 +583,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 is not set
 CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
 
@@ -10277,7 +10284,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