Sync with Arch

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

3 files changed, 15 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d72ec5de4038..2844c6b6ed05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-next-git
 	pkgdesc = Linux NEXT
-	pkgver = 20220622.r0.gac0ba5454ca8
+	pkgver = 20220722.r0.g18c107a1f120
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = x86_64
@@ -19,7 +19,7 @@ pkgbase = linux-next-git
 	source = config
 	sha512sums = SKIP
 	sha512sums = 654552b89b93cb78f1fd7cc7687db1e6d0a86789e0c31f812e61fbc1440e8135f3e5c46ff0abfd74d53d7bd81a60406bf262745697a9034f10bb5c464342febf
-	sha512sums = df3f00765aa2687c7e2f92e5c6a41faaa285e9286a25d503a6fe533214bdc752dc3315d50fe0095bf5cbb1378ed38e792520f0127feee955608e98b1065f16e8
+	sha512sums = 64db9f3bc2f2bf11002bfbbf76aa65089a92b36a003585b4444b75355cdeacbde2dae6c9f629713b734946e1bbfc8c20f5c701e1d44ef27e2a9866984a8eeba2
 
 pkgname = linux-next-git
 	pkgdesc = The Linux NEXT kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 31b5db9b850d..d01f9f2b1c0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -47,7 +47,7 @@ _1k_HZ_ticks=
 ### Do not edit below this line unless you know what you're doing
 
 pkgbase=linux-next-git
-pkgver=20220622.r0.gac0ba5454ca8
+pkgver=20220722.r0.g18c107a1f120
 _srcname=linux-next
 pkgrel=1
 pkgdesc='Linux NEXT'
@@ -287,4 +287,4 @@ done
 
 sha512sums=('SKIP'
             '654552b89b93cb78f1fd7cc7687db1e6d0a86789e0c31f812e61fbc1440e8135f3e5c46ff0abfd74d53d7bd81a60406bf262745697a9034f10bb5c464342febf'
-            'df3f00765aa2687c7e2f92e5c6a41faaa285e9286a25d503a6fe533214bdc752dc3315d50fe0095bf5cbb1378ed38e792520f0127feee955608e98b1065f16e8')
+            '64db9f3bc2f2bf11002bfbbf76aa65089a92b36a003585b4444b75355cdeacbde2dae6c9f629713b734946e1bbfc8c20f5c701e1d44ef27e2a9866984a8eeba2')
diff --git a/config b/config
index 3472a8f2bc06..5aa7cb085bcc 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.6-arch1 Kernel Configuration
+# Linux/x86 5.18.14-arch1 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
@@ -526,6 +523,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
 
@@ -10163,7 +10170,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