Update to 5.18.14-1

6 files changed, 63 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ace2d9ab95c..0a667faddbda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-ck
-	pkgver = 5.18.13
+	pkgver = 5.18.14
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -11,22 +11,24 @@ pkgbase = linux-ck
 	makedepends = tar
 	makedepends = xz
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.13.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.13.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.14.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.14.tar.sign
 	source = config
 	source = more-uarches-20220315.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20220315.tar.gz
 	source = ck-hrtimer-5d3a0424bdbfdf2fc4cca389bf0f1ee4876e782d.tar.gz::https://github.com/graysky2/linux-patches/archive/5d3a0424bdbfdf2fc4cca389bf0f1ee4876e782d.tar.gz
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	source = 0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch
+	source = 0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 430e1affe62fcca274f217b150290995a33ceb0d5ad5e72ca6ee8a2d28276bda
+	sha256sums = e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af
 	sha256sums = SKIP
-	sha256sums = 382aa201a6a6939210dd8668ab052724547b4bd489b38e97502bbd0848061b35
+	sha256sums = 6f0fd44dd87dd0ad23f782a26752bb7200d0d163e3a50df6ad3cf5cec7fe948e
 	sha256sums = 5a29d172d442a3f31a402d7d306aaa292b0b5ea29139d05080a55e2425f48c5c
 	sha256sums = 0506bdad4255ccc8165e39b2567450a3b12de2759ed7b42c0c90de1c57b1a283
-	sha256sums = 7294286511384aa7f7685b7f9cbe1d9729cc2ab8306541c9bdc6a521e2c92cb8
-	sha256sums = 15a2140a4bbf6b8ef32ddd6f7f65633c4af6aad9ca788c863d2d3fcfc0656fb2
+	sha256sums = 0799f30e1d6e2d4c8b4f62bcc391c09eabdea988e479ea3861d32289bc9e205e
+	sha256sums = ccb4f283d47a6c5e0109fbf27e7cde266a09d19c151a52f67f8e85e1d50cd0c1
+	sha256sums = 6e5499f68f6d3cc23ba259790cb37c0e860ece6faa30f9e8814ea329d7c58368
 
 pkgname = linux-ck
 	pkgdesc = The Linux kernel and modules with ck's hrtimer patches
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index bdb5b9a519b5..62a6a21ca27c 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From 81630fb51fe95fd5d184974ed0c9074f0d9a648d Mon Sep 17 00:00:00 2001
+From 63cec1d1efdb31caeef17411c7560e8b0f941073 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/4] ZEN: Add sysctl and CONFIG to disallow unprivileged
  CLONE_NEWUSER
 
 Our default behavior continues to match the vanilla kernel.
@@ -36,10 +36,10 @@ index 33a4240e6a6f..82213f9c4c17 100644
  {
  	return &init_user_ns;
 diff --git a/init/Kconfig b/init/Kconfig
-index b19e2eeaae80..2c2e01d76076 100644
+index fa63cc019ebf..5aa29feccae3 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1240,6 +1240,22 @@ config USER_NS
+@@ -1249,6 +1249,22 @@ config USER_NS
  
  	  If unsure, say N.
  
@@ -102,7 +102,7 @@ index 0d8abfb9e0f4..bd7c215e315f 100644
  	if (err)
  		goto bad_unshare_out;
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 830aaf8ca08e..af4c0806bd8e 100644
+index c42ba2d669dc..a6ddbf02a809 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
 @@ -91,6 +91,9 @@
@@ -115,7 +115,7 @@ index 830aaf8ca08e..af4c0806bd8e 100644
  
  #if defined(CONFIG_SYSCTL)
  
-@@ -1803,6 +1806,15 @@ static struct ctl_table kern_table[] = {
+@@ -1806,6 +1809,15 @@ static struct ctl_table kern_table[] = {
  		.mode		= 0644,
  		.proc_handler	= proc_dointvec,
  	},
@@ -150,5 +150,5 @@ index 5481ba44a8d6..423ab2563ad7 100644
  static DEFINE_MUTEX(userns_state_mutex);
  
 -- 
-2.36.1
+2.37.1
 
diff --git a/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch b/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch
index 3fa5fe6ec37b..0d6ed6e22205 100644
--- a/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch
+++ b/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch
@@ -1,7 +1,7 @@
-From 759410cbc43568775113a7d1c6bff1286a0d2a91 Mon Sep 17 00:00:00 2001
+From 4b81eecd4c636d953aaf4ebafd8171716f4c61fe Mon Sep 17 00:00:00 2001
 From: Bryan Cain <bryancain3@gmail.com>
 Date: Thu, 5 May 2022 13:12:21 -0600
-Subject: [PATCH 2/3] HID: apple: Properly handle function keys on Keychron
+Subject: [PATCH 2/4] HID: apple: Properly handle function keys on Keychron
  keyboards
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -103,5 +103,5 @@ index 0cf35caee9fa..42a568902f49 100644
  }
  
 -- 
-2.36.1
+2.37.1
 
diff --git a/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch b/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch
new file mode 100644
index 000000000000..f2a14582ac2b
--- /dev/null
+++ b/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch
@@ -0,0 +1,26 @@
+From 2da21cf28e573b84e5a5baecc1eda7372322375d Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 23 Jul 2022 11:14:46 +0200
+Subject: [PATCH 3/4] soundwire: Raise DEFAULT_PROBE_TIMEOUT to 10000 ms
+
+See: https://github.com/thesofproject/linux/issues/3777#issuecomment-1192655300
+---
+ drivers/soundwire/bus.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h
+index 7631ef5e71fb..d3ed828daac0 100644
+--- a/drivers/soundwire/bus.h
++++ b/drivers/soundwire/bus.h
+@@ -5,7 +5,7 @@
+ #define __SDW_BUS_H
+ 
+ #define DEFAULT_BANK_SWITCH_TIMEOUT 3000
+-#define DEFAULT_PROBE_TIMEOUT       2000
++#define DEFAULT_PROBE_TIMEOUT       10000
+ 
+ u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr);
+ 
+-- 
+2.37.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 0be636d24a68..fbb4786c2071 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -68,7 +68,7 @@ _subarch=
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 pkgbase=linux-ck
-pkgver=5.18.13
+pkgver=5.18.14
 pkgrel=1
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -92,18 +92,20 @@ source=(
   "ck-hrtimer-$_commit.tar.gz::https://github.com/graysky2/linux-patches/archive/$_commit.tar.gz"
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch
+  0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('430e1affe62fcca274f217b150290995a33ceb0d5ad5e72ca6ee8a2d28276bda'
+sha256sums=('e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af'
             'SKIP'
-            '382aa201a6a6939210dd8668ab052724547b4bd489b38e97502bbd0848061b35'
+            '6f0fd44dd87dd0ad23f782a26752bb7200d0d163e3a50df6ad3cf5cec7fe948e'
             '5a29d172d442a3f31a402d7d306aaa292b0b5ea29139d05080a55e2425f48c5c'
             '0506bdad4255ccc8165e39b2567450a3b12de2759ed7b42c0c90de1c57b1a283'
-            '7294286511384aa7f7685b7f9cbe1d9729cc2ab8306541c9bdc6a521e2c92cb8'
-            '15a2140a4bbf6b8ef32ddd6f7f65633c4af6aad9ca788c863d2d3fcfc0656fb2')
+            '0799f30e1d6e2d4c8b4f62bcc391c09eabdea988e479ea3861d32289bc9e205e'
+            'ccb4f283d47a6c5e0109fbf27e7cde266a09d19c151a52f67f8e85e1d50cd0c1'
+            '6e5499f68f6d3cc23ba259790cb37c0e860ece6faa30f9e8814ea329d7c58368')
 
 prepare() {
   cd linux-${pkgver}
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