kernel 5.18.6

3 files changed, 285 insertions, 131 deletions

diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog
index 298bb38..9b72710 100644
--- a/SOURCES/Patchlist.changelog
+++ b/SOURCES/Patchlist.changelog
@@ -1,3 +1,6 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/8c91f362b5c06f3ff01ca58ea67266da928f55b1
+ 8c91f362b5c06f3ff01ca58ea67266da928f55b1 drm/i915: Temporarily disable selective fetch for PSR2 on ADL-P
+
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/a7c0a52660e5b4c851d966b5aa634ffdd22650a2
  a7c0a52660e5b4c851d966b5aa634ffdd22650a2 drm/amd/display: Cap OLED brightness per max frame-average luminance
 
diff --git a/SOURCES/linux-surface.patch b/SOURCES/linux-surface.patch
index 92893a2..112f04c 100644
--- a/SOURCES/linux-surface.patch
+++ b/SOURCES/linux-surface.patch
@@ -1,4 +1,4 @@
-From 0ef12031f24090b026be178e97e6f24d7d316753 Mon Sep 17 00:00:00 2001
+From 0fab73a9029380c14e9de3e96a8aecad6fc4831d Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 18 Oct 2020 16:42:44 +0900
 Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI
@@ -99,7 +99,7 @@ index 6beb00858c33..d82d77387a0a 100644
 -- 
 2.36.1
 
-From 5269ad31e13145b8cd6a1f3a164074489235426e Mon Sep 17 00:00:00 2001
+From 65818d1bc0c35aa49a4912c8ff19da2dd8bbd6f4 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Tue, 29 Sep 2020 17:32:22 +0900
 Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3
@@ -284,7 +284,7 @@ index 8ec4176d698f..25370c5a4f59 100644
 -- 
 2.36.1
 
-From a001adb78fb6163901066d66ca8f3f2af55acb48 Mon Sep 17 00:00:00 2001
+From 933ba6868540a32c3f0938ebcbe20ec2d7deb5b6 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Wed, 30 Sep 2020 18:08:24 +0900
 Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI
@@ -346,7 +346,7 @@ index 563dd0d5ac79..32e2f000e57b 100644
 -- 
 2.36.1
 
-From 070c7c749c3ad4f55f19a2dc571ac948858ef758 Mon Sep 17 00:00:00 2001
+From 28ae216538cd229ca79e112f76e976d6f873d53c Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:11:49 +0900
 Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+
@@ -501,7 +501,7 @@ index 25370c5a4f59..a1de111ad1db 100644
 -- 
 2.36.1
 
-From a32df1183abf331656d8136ee338e331bb10a3c3 Mon Sep 17 00:00:00 2001
+From af05ad1ab5df8de384971c1a85a61bd94b886229 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 3 Nov 2020 13:28:04 +0100
 Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface
@@ -668,7 +668,7 @@ index a1de111ad1db..0e429779bb04 100644
 -- 
 2.36.1
 
-From a38c2caa97b3ede384d6cde8bdf6f75136e475a5 Mon Sep 17 00:00:00 2001
+From fee88e1ed2e94d99f4f694e650e8c7136ded9d87 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 25 Mar 2021 11:33:02 +0100
 Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell
@@ -746,7 +746,7 @@ index e48c3ad069bb..d7704d4e568d 100644
 -- 
 2.36.1
 
-From 2280f1ac0ec588e341cdf2dcf689758555783024 Mon Sep 17 00:00:00 2001
+From 117373e80308eb98257cb34aa24f9220d17f7a73 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 10 Nov 2020 12:49:56 +0100
 Subject: [PATCH] mwifiex: Use non-posted PCI register writes
@@ -803,7 +803,7 @@ index 24bcd22a2618..b4ad0113a035 100644
 -- 
 2.36.1
 
-From 8b13cea0f23f2556cd4c7bc10b567272b385bbea Mon Sep 17 00:00:00 2001
+From 385c7bd5ce88a2e997810c8beb98671da65bc97e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 27 Feb 2021 00:45:52 +0100
 Subject: [PATCH] ath10k: Add module parameters to override board files
@@ -924,7 +924,7 @@ index 9e1f483e1362..34cfce241e4a 100644
 -- 
 2.36.1
 
-From 39a0f300b7a779d283f758e0aa5ff2ba2511177e Mon Sep 17 00:00:00 2001
+From 49bb282c2517f60a91dc5c095a13f90dcd9dbc38 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Thu, 30 Jul 2020 13:21:53 +0200
 Subject: [PATCH] misc: mei: Add missing IPTS device IDs
@@ -936,7 +936,7 @@ Patchset: ipts
  2 files changed, 2 insertions(+)
 
 diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
-index 64ce3f830262..c208a1e3a7c1 100644
+index 15e8e2b322b1..91587b808323 100644
 --- a/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 @@ -92,6 +92,7 @@
@@ -948,7 +948,7 @@ index 64ce3f830262..c208a1e3a7c1 100644
  
  #define MEI_DEV_ID_JSP_N      0x4DE0  /* Jasper Lake Point N */
 diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
-index 33e58821e478..fde0ad009b17 100644
+index 5435604327a7..1165ee4f5928 100644
 --- a/drivers/misc/mei/pci-me.c
 +++ b/drivers/misc/mei/pci-me.c
 @@ -97,6 +97,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
@@ -962,7 +962,7 @@ index 33e58821e478..fde0ad009b17 100644
 -- 
 2.36.1
 
-From d4410624127fad830c6ee347453688765034593b Mon Sep 17 00:00:00 2001
+From 348ed5f890d3e8ece0d53a06da5ef4ec5de8372e Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Thu, 6 Aug 2020 11:20:41 +0200
 Subject: [PATCH] misc: Add support for Intel Precise Touch & Stylus
@@ -2427,7 +2427,7 @@ index 000000000000..53fb86a88f97
 -- 
 2.36.1
 
-From 4272f294f24ca0ac68c7acdbb9cbc7d86a094fa3 Mon Sep 17 00:00:00 2001
+From 8c3962b940a506badb4bb231cb36bcd03a2bfe68 Mon Sep 17 00:00:00 2001
 From: Liban Hannan <liban.p@gmail.com>
 Date: Tue, 12 Apr 2022 23:31:12 +0100
 Subject: [PATCH] iommu: ipts: use IOMMU passthrough mode for IPTS
@@ -2527,7 +2527,7 @@ index ba9a63cac47c..5f18ec206696 100644
 -- 
 2.36.1
 
-From 097657e71c5be762bf979a3113103a10fd2d7948 Mon Sep 17 00:00:00 2001
+From 5365ad4864dded37227fe374fd44cd16ed9c2f95 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:36 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow is_ssam_device() to be
@@ -2584,7 +2584,7 @@ index cc257097eb05..62b38b4487eb 100644
 -- 
 2.36.1
 
-From d562e9d16ba3e9c6c5ff1211e2b70144cedd82d2 Mon Sep 17 00:00:00 2001
+From 7bccd80bbbc30633a69063feea0eb44d5789dbf3 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:37 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow devices to be marked as
@@ -2693,7 +2693,7 @@ index 62b38b4487eb..6df7c8d4e50e 100644
 -- 
 2.36.1
 
-From 48200d7535f3220bc293f016965eceaf7b07c072 Mon Sep 17 00:00:00 2001
+From a7829d0bb15ae0d775831fd90c8eecbbabb5b3ea Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:38 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow notifiers to avoid
@@ -2989,7 +2989,7 @@ index 6df7c8d4e50e..c418f7f2732d 100644
 -- 
 2.36.1
 
-From dacf08a098a2e6f4e94d1e2942bc55650610f08b Mon Sep 17 00:00:00 2001
+From 107512f8b969a44eed924b47475a1b1b5537a241 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:39 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Use client device
@@ -3041,7 +3041,7 @@ index ce2bd88feeaa..9f630e890ff7 100644
 -- 
 2.36.1
 
-From d37dad7828ee0eb07f43a5fa8e65f4e42578aee0 Mon Sep 17 00:00:00 2001
+From 412340129be1352c1dd4a529e495b7fffafa9ecd Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:40 +0200
 Subject: [PATCH] power/supply: surface_charger: Use client device wrappers for
@@ -3085,7 +3085,7 @@ index a060c36c7766..59182d55742d 100644
 -- 
 2.36.1
 
-From aa33fbfcae2a5180a73a0c7c4d191b5a86dc3a5c Mon Sep 17 00:00:00 2001
+From 579ce615f427fdbdb51c094ff28242f97c3b1b29 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:41 +0200
 Subject: [PATCH] power/supply: surface_battery: Use client device wrappers for
@@ -3129,7 +3129,7 @@ index 5ec2e6bb2465..540707882bb0 100644
 -- 
 2.36.1
 
-From 4e747fd2e517665eb7d8282b0c7c5c77b907e298 Mon Sep 17 00:00:00 2001
+From 39b48768123e20aa076d559e00606553c0bed039 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:42 +0200
 Subject: [PATCH] HID: surface-hid: Add support for hot-removal
@@ -3243,7 +3243,7 @@ index e46330b2e561..87637f813de2 100644
 -- 
 2.36.1
 
-From 1261ddf08d3e8ea6a66fa8f3127e1e931b70dae3 Mon Sep 17 00:00:00 2001
+From 6206fd4e54cc0a2b17802644785068f3031e5056 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:43 +0200
 Subject: [PATCH] platform/surface: aggregator: Add comment for KIP subsystem
@@ -3284,7 +3284,7 @@ index c3de43edcffa..26b95ec12733 100644
 -- 
 2.36.1
 
-From 0bd82a6a348dc780edee3feb0c1619e74b9928e5 Mon Sep 17 00:00:00 2001
+From c33b2b178fc66595a3085e239f5c3591b1d978f0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:44 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Generify subsystem hub
@@ -3674,7 +3674,7 @@ index 9f630e890ff7..09cbeee2428b 100644
 -- 
 2.36.1
 
-From 29688869f641940bcf1a42b0dbeb0e7e55af47a3 Mon Sep 17 00:00:00 2001
+From 81e0adc2996e65361c41ae3a1722c05a8d43eecc Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:45 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Change device ID for
@@ -3718,7 +3718,7 @@ index 09cbeee2428b..b11ce87c7184 100644
 -- 
 2.36.1
 
-From 431a0450a5d32e9091a248f8a81acea4b2188699 Mon Sep 17 00:00:00 2001
+From 4a132f261524f301dbfdc3bb7149b51d51231d1c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:46 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add KIP device hub
@@ -3883,7 +3883,7 @@ index b11ce87c7184..f15cef60630f 100644
 -- 
 2.36.1
 
-From f61f1f111b7b347e642755879542bc8c4778617f Mon Sep 17 00:00:00 2001
+From bbfe3754e39e8dfcbc0c5fff6d53ede8fbb382af Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 27 May 2022 04:34:47 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for
@@ -3984,7 +3984,7 @@ index f15cef60630f..bf3303f1aa71 100644
 -- 
 2.36.1
 
-From a0044e1fad27f45d2bf251c831b37c78e10b6933 Mon Sep 17 00:00:00 2001
+From 1cfa83fcfdb17e7fc4c261bd482c2eaffcc80c34 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 14 Jun 2022 13:17:49 +0200
 Subject: [PATCH] platform/surface: aggregator: Reserve more event- and
@@ -4203,7 +4203,7 @@ index 26b95ec12733..45501b6e54e8 100644
 -- 
 2.36.1
 
-From 0de5abea7880ab860df0db95fa4c1b990731a140 Mon Sep 17 00:00:00 2001
+From cc611b57bc5ffe16a954764fa64c137fe5bf1941 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 16 Jun 2022 01:50:12 +0200
 Subject: [PATCH] platform/surface: aggregator: Add helper macros for requests
@@ -4413,7 +4413,7 @@ index c418f7f2732d..6cf7e80312d5 100644
 -- 
 2.36.1
 
-From 87e36bd7600f7fcc19cabbf24226b0e93970aae0 Mon Sep 17 00:00:00 2001
+From 2896ce905f13d5e25217feac5b8c6cadc04865ee Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 8 Jun 2021 03:19:20 +0200
 Subject: [PATCH] platform/surface: Add KIP tablet-mode switch
@@ -5049,7 +5049,7 @@ index 000000000000..6f402d2ca894
 -- 
 2.36.1
 
-From b5a8577c9a5de65f6954fbd2c952a6d97933482e Mon Sep 17 00:00:00 2001
+From 6dc28c067166d7760e9a3c3ec5ac3c37c031fcdd Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 27 Oct 2021 22:33:03 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for tablet
@@ -5099,7 +5099,7 @@ index bf3303f1aa71..8f249df673a4 100644
 -- 
 2.36.1
 
-From b7a5dfd805b01a1867d3637c6e6d0a490c4fc903 Mon Sep 17 00:00:00 2001
+From 5ded1673d830512304af5c8951bf2a998af7a8c1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 16 Jun 2022 02:30:16 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for tablet
@@ -5143,7 +5143,7 @@ index 8f249df673a4..f1c5905f1c16 100644
 -- 
 2.36.1
 
-From b2d3071a17e7641ed2a87112b25927ee9582043e Mon Sep 17 00:00:00 2001
+From 6276cdd16c2d8488f46b3bd8d411dc682c10f63b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 21 May 2022 00:30:46 +0200
 Subject: [PATCH] platform/surface: aggregator: Move device registry helper
@@ -5532,7 +5532,7 @@ index 6cf7e80312d5..6e75fb605479 100644
 -- 
 2.36.1
 
-From 05c3fb864633d525a61f9e11788cce689482040b Mon Sep 17 00:00:00 2001
+From aef718d296d0a7550e906ca753819c3cd2731b3b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 21 May 2022 00:39:56 +0200
 Subject: [PATCH] platform/surface: aggregator: Move subsystem hub drivers to
@@ -6419,7 +6419,7 @@ index c680792a037e..0cbb7f3a6b2d 100644
 -- 
 2.36.1
 
-From 8de2bf13dcbae29464f19bd544484586f3950a29 Mon Sep 17 00:00:00 2001
+From 81671cda3972cd69ea51aa2591968a492930816a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 21 May 2022 00:57:40 +0200
 Subject: [PATCH] platform/surface: Update copyright year of various drivers
@@ -6738,7 +6738,209 @@ index 6373d3b5eb7f..fbf2e11fd6ce 100644
 -- 
 2.36.1
 
-From 28746d1a90e755dd3f55da6e66ce7e9726bfccf0 Mon Sep 17 00:00:00 2001
+From dbd7c1c3f2f4ac8646f6fda25ec843d3ab58dbda Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Sat, 25 Jun 2022 20:42:00 +0200
+Subject: [PATCH] platform/surface: aggregatgor_registry: Rename HID device
+ nodes based on their function
+
+Rename HID device nodes based on their function. In particular, these
+are nodes for firmware updates via the CFU mechanism (component firmware
+update), HID based sensors, and a USB-C USCI client.
+
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+Patchset: surface-sam
+---
+ .../surface/surface_aggregator_registry.c      | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
+index d5655f6a4a41..b325fa0c5ee0 100644
+--- a/drivers/platform/surface/surface_aggregator_registry.c
++++ b/drivers/platform/surface/surface_aggregator_registry.c
+@@ -104,14 +104,14 @@ static const struct software_node ssam_node_hid_tid1_touchpad = {
+ 	.parent = &ssam_node_root,
+ };
+ 
+-/* HID device instance 6 (TID1, unknown HID device). */
+-static const struct software_node ssam_node_hid_tid1_iid6 = {
++/* HID device instance 6 (TID1, HID sensor collection). */
++static const struct software_node ssam_node_hid_tid1_sensors = {
+ 	.name = "ssam:01:15:01:06:00",
+ 	.parent = &ssam_node_root,
+ };
+ 
+-/* HID device instance 7 (TID1, unknown HID device). */
+-static const struct software_node ssam_node_hid_tid1_iid7 = {
++/* HID device instance 7 (TID1, UCM USCI HID client). */
++static const struct software_node ssam_node_hid_tid1_ucm_usci = {
+ 	.name = "ssam:01:15:01:07:00",
+ 	.parent = &ssam_node_root,
+ };
+@@ -182,8 +182,8 @@ static const struct software_node ssam_node_hid_kip_touchpad = {
+ 	.parent = &ssam_node_hub_kip,
+ };
+ 
+-/* HID device instance 5 (KIP hub, unknown HID device). */
+-static const struct software_node ssam_node_hid_kip_iid5 = {
++/* HID device instance 5 (KIP hub, type-cover firmware update). */
++static const struct software_node ssam_node_hid_kip_fwupd = {
+ 	.name = "ssam:01:15:02:05:00",
+ 	.parent = &ssam_node_hub_kip,
+ };
+@@ -244,8 +244,8 @@ static const struct software_node *ssam_node_group_sls[] = {
+ 	&ssam_node_hid_tid1_keyboard,
+ 	&ssam_node_hid_tid1_penstash,
+ 	&ssam_node_hid_tid1_touchpad,
+-	&ssam_node_hid_tid1_iid6,
+-	&ssam_node_hid_tid1_iid7,
++	&ssam_node_hid_tid1_sensors,
++	&ssam_node_hid_tid1_ucm_usci,
+ 	&ssam_node_hid_tid1_sysctrl,
+ 	NULL,
+ };
+@@ -278,7 +278,7 @@ static const struct software_node *ssam_node_group_sp8[] = {
+ 	&ssam_node_hid_kip_keyboard,
+ 	&ssam_node_hid_kip_penstash,
+ 	&ssam_node_hid_kip_touchpad,
+-	&ssam_node_hid_kip_iid5,
++	&ssam_node_hid_kip_fwupd,
+ 	NULL,
+ };
+ 
+-- 
+2.36.1
+
+From c4b4b8f4099b29e0fbf0a537ff6be12149b1d85c Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Sat, 25 Jun 2022 20:52:47 +0200
+Subject: [PATCH] platform/surface: aggregatgor_registry: Rename HID device
+ nodes based on new findings
+
+On Windows, the HID devices with target ID 1 are grouped as "Surface Hot
+Plug - SAM". Rename their device nodes in the registry to reflect that
+and update the comments accordingly.
+
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+Patchset: surface-sam
+---
+ .../surface/surface_aggregator_registry.c     | 36 +++++++++----------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
+index b325fa0c5ee0..3aa825b5aa26 100644
+--- a/drivers/platform/surface/surface_aggregator_registry.c
++++ b/drivers/platform/surface/surface_aggregator_registry.c
+@@ -86,38 +86,38 @@ static const struct software_node ssam_node_bas_dtx = {
+ 	.parent = &ssam_node_root,
+ };
+ 
+-/* HID keyboard (TID1). */
+-static const struct software_node ssam_node_hid_tid1_keyboard = {
++/* HID keyboard (SAM, TID=1). */
++static const struct software_node ssam_node_hid_sam_keyboard = {
+ 	.name = "ssam:01:15:01:01:00",
+ 	.parent = &ssam_node_root,
+ };
+ 
+-/* HID pen stash (TID1; pen taken / stashed away evens). */
+-static const struct software_node ssam_node_hid_tid1_penstash = {
++/* HID pen stash (SAM, TID=1; pen taken / stashed away evens). */
++static const struct software_node ssam_node_hid_sam_penstash = {
+ 	.name = "ssam:01:15:01:02:00",
+ 	.parent = &ssam_node_root,
+ };
+ 
+-/* HID touchpad (TID1). */
+-static const struct software_node ssam_node_hid_tid1_touchpad = {
++/* HID touchpad (SAM, TID=1). */
++static const struct software_node ssam_node_hid_sam_touchpad = {
+ 	.name = "ssam:01:15:01:03:00",
+ 	.parent = &ssam_node_root,
+ };
+ 
+-/* HID device instance 6 (TID1, HID sensor collection). */
+-static const struct software_node ssam_node_hid_tid1_sensors = {
++/* HID device instance 6 (SAM, TID=1, HID sensor collection). */
++static const struct software_node ssam_node_hid_sam_sensors = {
+ 	.name = "ssam:01:15:01:06:00",
+ 	.parent = &ssam_node_root,
+ };
+ 
+-/* HID device instance 7 (TID1, UCM USCI HID client). */
+-static const struct software_node ssam_node_hid_tid1_ucm_usci = {
++/* HID device instance 7 (SAM, TID=1, UCM USCI HID client). */
++static const struct software_node ssam_node_hid_sam_ucm_usci = {
+ 	.name = "ssam:01:15:01:07:00",
+ 	.parent = &ssam_node_root,
+ };
+ 
+-/* HID system controls (TID1). */
+-static const struct software_node ssam_node_hid_tid1_sysctrl = {
++/* HID system controls (SAM, TID=1). */
++static const struct software_node ssam_node_hid_sam_sysctrl = {
+ 	.name = "ssam:01:15:01:08:00",
+ 	.parent = &ssam_node_root,
+ };
+@@ -241,12 +241,12 @@ static const struct software_node *ssam_node_group_sls[] = {
+ 	&ssam_node_bat_main,
+ 	&ssam_node_tmp_pprof,
+ 	&ssam_node_pos_tablet_switch,
+-	&ssam_node_hid_tid1_keyboard,
+-	&ssam_node_hid_tid1_penstash,
+-	&ssam_node_hid_tid1_touchpad,
+-	&ssam_node_hid_tid1_sensors,
+-	&ssam_node_hid_tid1_ucm_usci,
+-	&ssam_node_hid_tid1_sysctrl,
++	&ssam_node_hid_sam_keyboard,
++	&ssam_node_hid_sam_penstash,
++	&ssam_node_hid_sam_touchpad,
++	&ssam_node_hid_sam_sensors,
++	&ssam_node_hid_sam_ucm_usci,
++	&ssam_node_hid_sam_sysctrl,
+ 	NULL,
+ };
+ 
+-- 
+2.36.1
+
+From 86fcf5b729104741e5d3a0841a1e762df07192f2 Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Sat, 25 Jun 2022 20:54:59 +0200
+Subject: [PATCH] platform/surface: aggregatgor_registry: Add HID devices for
+ sensors and USCI client to SP8
+
+Add software nodes for the HID sensor collection and the UCM USCI HID
+client to the Surface Pro 8. In contrast to the type-cover devices,
+these devices are directly attached to the SAM controller, without any
+hub.
+
+This enables support for HID-based sensors, including the ones used for
+automatic screen rotation, on the Surface Pro 8.
+
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+Patchset: surface-sam
+---
+ drivers/platform/surface/surface_aggregator_registry.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
+index 3aa825b5aa26..4c2f9f789354 100644
+--- a/drivers/platform/surface/surface_aggregator_registry.c
++++ b/drivers/platform/surface/surface_aggregator_registry.c
+@@ -279,6 +279,8 @@ static const struct software_node *ssam_node_group_sp8[] = {
+ 	&ssam_node_hid_kip_penstash,
+ 	&ssam_node_hid_kip_touchpad,
+ 	&ssam_node_hid_kip_fwupd,
++	&ssam_node_hid_sam_sensors,
++	&ssam_node_hid_sam_ucm_usci,
+ 	NULL,
+ };
+ 
+-- 
+2.36.1
+
+From 7602afb0e3899d47962ad434dfcf3a34f94bac99 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jul 2020 17:19:53 +0200
 Subject: [PATCH] i2c: acpi: Implement RawBytes read access
@@ -6850,7 +7052,7 @@ index 08b561f0709d..d7c397bce0f0 100644
 -- 
 2.36.1
 
-From 9d1d2f048b6080077fd57c755cb132c3fa8e7399 Mon Sep 17 00:00:00 2001
+From 3d303cfc176d0dcd9fe65de082f4aea8f075011a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 13 Feb 2021 16:41:18 +0100
 Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch
@@ -7073,7 +7275,7 @@ index 000000000000..8b816ed8f35c
 -- 
 2.36.1
 
-From 152ccacc3342985462a38d441abbdf7a8945dfcb Mon Sep 17 00:00:00 2001
+From 83d91d5e1b288bcb27a98e6bb8944a6e99cce3ac Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Tue, 5 Oct 2021 00:05:09 +1100
 Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices
@@ -7095,7 +7297,7 @@ Patchset: surface-button
  1 file changed, 8 insertions(+), 25 deletions(-)
 
 diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
-index cbb1599a520e..f044c731c6a9 100644
+index 480476121c01..36e1bf7b7a01 100644
 --- a/drivers/input/misc/soc_button_array.c
 +++ b/drivers/input/misc/soc_button_array.c
 @@ -495,8 +495,8 @@ static const struct soc_device_data soc_device_MSHW0028 = {
@@ -7150,7 +7352,7 @@ index cbb1599a520e..f044c731c6a9 100644
 -- 
 2.36.1
 
-From bbd06fea568d91284defb36d91818f57bd861358 Mon Sep 17 00:00:00 2001
+From 223131fd19bf1d19fdb7820696c764382211610d Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Tue, 5 Oct 2021 00:22:57 +1100
 Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd
@@ -7222,45 +7424,7 @@ index 242fb690dcaf..30eea54dbb47 100644
 -- 
 2.36.1
 
-From 218c6d1a0995bc905e4d24e0ea6d3d164a884fd5 Mon Sep 17 00:00:00 2001
-From: Duke Lee <krnhotwings@gmail.com>
-Date: Fri, 10 Jun 2022 13:49:48 -0700
-Subject: [PATCH] platform/x86/intel: hid: Add Surface Go to VGBS allow list
-
-The Surface Go reports Chassis Type 9 (Laptop,) so the device needs to be
-added to dmi_vgbs_allow_list to enable tablet mode when an attached Type
-Cover is folded back.
-
-Relevant bug report and discussion:
-https://github.com/linux-surface/linux-surface/issues/837
-
-Signed-off-by: Duke Lee <krnhotwings@gmail.com>
-Patchset: surface-button
----
- drivers/platform/x86/intel/hid.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c
-index 216d31e3403d..79cff1fc675c 100644
---- a/drivers/platform/x86/intel/hid.c
-+++ b/drivers/platform/x86/intel/hid.c
-@@ -122,6 +122,12 @@ static const struct dmi_system_id dmi_vgbs_allow_list[] = {
- 			DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Convertible 15-df0xxx"),
- 		},
- 	},
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "Surface Go"),
-+		},
-+	},
- 	{ }
- };
- 
--- 
-2.36.1
-
-From e42467a6c2b0397194dd542921c05b4f075de29f Mon Sep 17 00:00:00 2001
+From b4bb0ea6289e829a3fd03f325f66c9185ab9ca8d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 5 Nov 2020 13:09:45 +0100
 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when
@@ -7493,7 +7657,7 @@ index 6bb3890b0f2c..c28349e90156 100644
 -- 
 2.36.1
 
-From a18a2ab98dd916aa70519b8abf9a1970e54ae4f6 Mon Sep 17 00:00:00 2001
+From 9bf6f0c8347006297dddf45bd628c2055971ca36 Mon Sep 17 00:00:00 2001
 From: PJungkamp <p.jungkamp@gmail.com>
 Date: Fri, 25 Feb 2022 12:04:25 +0100
 Subject: [PATCH] hid/multitouch: Add support for surface pro type cover tablet
@@ -7793,7 +7957,7 @@ index c28349e90156..61142639be26 100644
 -- 
 2.36.1
 
-From 36666be7e25bc5cfc387a2b3cdd03f694e1e2a6a Mon Sep 17 00:00:00 2001
+From cb1cfa88f1337fed645b5ef12241674c33a1ad5c Mon Sep 17 00:00:00 2001
 From: Werner Sembach <wse@tuxedocomputers.com>
 Date: Wed, 27 Apr 2022 17:40:53 +0200
 Subject: [PATCH] ACPI: battery: Make "not-charging" the default on no charging
@@ -7876,7 +8040,7 @@ index dc208f5f5a1f..306513fec1e1 100644
 -- 
 2.36.1
 
-From 940d757175c48957b7cd8667039757fa5b579b37 Mon Sep 17 00:00:00 2001
+From b3735269ebf85e2779c203ee5d36789996b8b920 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 25 May 2022 14:20:10 +0200
 Subject: [PATCH] HID: hid-input: add Surface Go battery quirk
@@ -7924,7 +8088,7 @@ index c6b27aab9041..48c1c02c69f4 100644
 -- 
 2.36.1
 
-From 62c1ed9a1011c9c316d9996fa8b5472949779535 Mon Sep 17 00:00:00 2001
+From fe54690dea48d77ddd3fecad17f494fedf6105d1 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Sun, 10 Oct 2021 20:56:57 +0200
 Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an
@@ -8000,7 +8164,7 @@ index 762b61f67e6c..2c0f39a7f2a1 100644
 -- 
 2.36.1
 
-From 682453621bd191154379cfb587b6250225981d50 Mon Sep 17 00:00:00 2001
+From 2f8413e4eaba93b9e7044c53ef178e64c272c5b0 Mon Sep 17 00:00:00 2001
 From: zouxiaoh <xiaohong.zou@intel.com>
 Date: Fri, 25 Jun 2021 08:52:59 +0800
 Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs
@@ -8117,7 +8281,7 @@ index 5f18ec206696..2b31e531f510 100644
 -- 
 2.36.1
 
-From 75c9a2ede854cfaa86e1a79ed40a2d8763a0e45a Mon Sep 17 00:00:00 2001
+From d53f8ea945c2064dc9450973e2b4d27c927819ea Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 10 Oct 2021 20:57:02 +0200
 Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain
@@ -8154,7 +8318,7 @@ index 22f61b47f9e5..e1de1ff40bba 100644
 -- 
 2.36.1
 
-From 12ef137e4f5748917c80c2460cd2df3c14359693 Mon Sep 17 00:00:00 2001
+From bea1033389f261e041905b87dc1ca2e4de7f1721 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 28 Oct 2021 21:55:16 +0100
 Subject: [PATCH] media: i2c: Add driver for DW9719 VCM
@@ -8660,7 +8824,7 @@ index 000000000000..8451c75b696b
 -- 
 2.36.1
 
-From f593c5339ca9bb85d4bc1eff3d5b90543b433c9e Mon Sep 17 00:00:00 2001
+From d159eda73eb63dd066ac04c1bd70f8dbd3dc70fd Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 13 Dec 2021 22:38:17 +0000
 Subject: [PATCH] media: entity: Skip non-data links in graph iteration
@@ -8695,7 +8859,7 @@ index 8ab0913d8d82..a8631f74dcee 100644
 -- 
 2.36.1
 
-From cc5f72a20e5e849d7a11b41d653554be2009933f Mon Sep 17 00:00:00 2001
+From c012944c0b44e0e57934501398ecff2da5f29c75 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 13 Dec 2021 22:53:09 +0000
 Subject: [PATCH] media: media.h: Add new media link type
@@ -8779,7 +8943,7 @@ index 200fa8462b90..afbae7213d35 100644
 -- 
 2.36.1
 
-From 38b3de96c747d8be99ec8b255b5b9280c2799dd0 Mon Sep 17 00:00:00 2001
+From 37744d5fbb68bd91a27650c13e48c85f838efb0e Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 13 Dec 2021 22:36:31 +0000
 Subject: [PATCH] media: entity: Add link_type_name() helper
@@ -8834,7 +8998,7 @@ index a8631f74dcee..4bd80ce1a33d 100644
 -- 
 2.36.1
 
-From 727823e3ceb808a4cd61f69695e41311420cdb2a Mon Sep 17 00:00:00 2001
+From ba32c36619b605d374668a222e04dc1793bf5227 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 13 Dec 2021 22:54:10 +0000
 Subject: [PATCH] media: entity: Add support for ancillary links
@@ -8911,7 +9075,7 @@ index 742918962d46..1d13b8939a11 100644
 -- 
 2.36.1
 
-From 87967cea56c8a58da1fc741497b2c1992d2c4a91 Mon Sep 17 00:00:00 2001
+From c007a91e6342dbe7c3e72e9b902ac260072e9b6e Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 26 Nov 2021 22:55:50 +0000
 Subject: [PATCH] media: v4l2-async: Create links during
@@ -8984,7 +9148,7 @@ index 0404267f1ae4..436bd6900fd8 100644
 -- 
 2.36.1
 
-From 8e5a392560fed1d042ae6d9a84ff6d704fcc4015 Mon Sep 17 00:00:00 2001
+From 2da35f746af7c7cf8e29a16e671130aa2ea4da84 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 4 May 2022 23:21:45 +0100
 Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to
@@ -9099,7 +9263,7 @@ index 0e9b0503b62a..50682a7b2a07 100644
 -- 
 2.36.1
 
-From 04ec896483e11443b551beb9ad8d647918a88178 Mon Sep 17 00:00:00 2001
+From 43f9531073c74ad7a361e4161c18bb6735eeacc2 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 2 Jun 2022 22:15:56 +0100
 Subject: [PATCH] media: ipu3-cio2: Re-add .complete() to ipu3-cio2
@@ -9142,7 +9306,7 @@ index 50682a7b2a07..ff79582a583d 100644
 -- 
 2.36.1
 
-From f1c39233f6c15b93d566724eef4a439993061b12 Mon Sep 17 00:00:00 2001
+From 28a57fa6892aad0e172f1318bf2b658b99ba66f4 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Sat, 29 May 2021 17:47:38 +1000
 Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7
@@ -9209,7 +9373,7 @@ index 0d01e7f5078c..2b06cf5f2b1f 100644
 -- 
 2.36.1
 
-From db041584a330a1d5c30c6436161e8d77dcc5a4db Mon Sep 17 00:00:00 2001
+From ed5e63fdf9ff897c3f978216ebddfb8f36356aa9 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 3 Jun 2021 14:04:26 +0200
 Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override
diff --git a/SOURCES/patch-5.18-redhat.patch b/SOURCES/patch-5.18-redhat.patch
index 9d2bd56..16a0cc3 100644
--- a/SOURCES/patch-5.18-redhat.patch
+++ b/SOURCES/patch-5.18-redhat.patch
@@ -20,7 +20,7 @@
  drivers/firmware/efi/libstub/x86-stub.c            | 119 +++++++++++++++++++-
  drivers/firmware/efi/secureboot.c                  |  38 +++++++
  drivers/firmware/sysfb.c                           |  18 ++-
- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |   8 +-
+ drivers/gpu/drm/i915/display/intel_psr.c           |   9 ++
  drivers/hid/hid-rmi.c                              |  64 -----------
  drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 ++++
  drivers/input/rmi4/rmi_driver.c                    | 124 ++++++++++++---------
@@ -42,10 +42,10 @@
  security/lockdown/Kconfig                          |  13 +++
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
- 44 files changed, 716 insertions(+), 195 deletions(-)
+ 44 files changed, 721 insertions(+), 191 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 34bfb76d6333..14b77f963807 100644
+index 27850d452d65..c6cd7b49725d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -924,39 +924,26 @@ index 2bfbb05f7d89..a504f7234f35 100644
  		ret = sysfb_create_simplefb(si, &mode);
  		if (!ret)
  			return 0;
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-index 8dd03de7c277..78a38c3b7d66 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -2835,7 +2835,7 @@ static struct drm_mode_config_helper_funcs amdgpu_dm_mode_config_helperfuncs = {
+diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
+index 6c9e6e7f0afd..f0ff2f1f5fcb 100644
+--- a/drivers/gpu/drm/i915/display/intel_psr.c
++++ b/drivers/gpu/drm/i915/display/intel_psr.c
+@@ -744,6 +744,15 @@ static bool intel_psr2_sel_fetch_config_valid(struct intel_dp *intel_dp,
+ 		return false;
+ 	}
+
++	/* Temporary workaround for Lenovo's issues with the X1 Carbon 10th Gen
++	 * See: https://bugzilla.redhat.com/show_bug.cgi?id=2065794
++	 */
++	if (IS_ALDERLAKE_P(dev_priv)) {
++		drm_dbg_kms(&dev_priv->drm,
++			    "PSR2 sel fetch disabled on ADL-P, see rhbz2065794\n");
++		return false;
++	}
++
+ 	return crtc_state->enable_psr2_sel_fetch = true;
+ }
 
- static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector)
- {
--	u32 max_cll, min_cll, max, min, q, r;
-+	u32 max_avg, min_cll, max, min, q, r;
- 	struct amdgpu_dm_backlight_caps *caps;
- 	struct amdgpu_display_manager *dm;
- 	struct drm_connector *conn_base;
-@@ -2865,7 +2865,7 @@ static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector)
- 	caps = &dm->backlight_caps[i];
- 	caps->ext_caps = &aconnector->dc_link->dpcd_sink_ext_caps;
- 	caps->aux_support = false;
--	max_cll = conn_base->hdr_sink_metadata.hdmi_type1.max_cll;
-+	max_avg = conn_base->hdr_sink_metadata.hdmi_type1.max_fall;
- 	min_cll = conn_base->hdr_sink_metadata.hdmi_type1.min_cll;
-
- 	if (caps->ext_caps->bits.oled == 1 /*||
-@@ -2893,8 +2893,8 @@ static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector)
- 	 * The results of the above expressions can be verified at
- 	 * pre_computed_values.
- 	 */
--	q = max_cll >> 5;
--	r = max_cll % 32;
-+	q = max_avg >> 5;
-+	r = max_avg % 32;
- 	max = (1 << q) * pre_computed_values[r];
-
- 	// min luminance: maxLum * (CV/255)^2 / 100
 diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
 index 311eee599ce9..2460c6bd46f8 100644
 --- a/drivers/hid/hid-rmi.c
@@ -1341,7 +1328,7 @@ index 857d4c2fd1a2..9353941f3a97 100644
   * Changes the default domain of an iommu group that has *only* one device
   *
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 2d6a01853109..f22cd4b9c118 100644
+index 1ea85c88d795..d30563dabd95 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
 @@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1679,10 +1666,10 @@ index 7fc4e9f49f54..6f0b0b2dc73d 100644
 
  #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
 diff --git a/init/Kconfig b/init/Kconfig
-index b19e2eeaae80..7d12d49b9024 100644
+index fa63cc019ebf..8643b5cef9f1 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1654,7 +1654,7 @@ config AIO
+@@ -1663,7 +1663,7 @@ config AIO
  	  this option saves about 7k.
 
  config IO_URING