Update v6.1 patches

Changes: - Rebase onto v6.1.31 Links: - kernel: beb706f0bc
2023-06-02 11:42:25 +02:00 · 2023-06-02 11:42:25 +02:00 · 2d3291edcc
parent 8446e8f996
commit 2d3291edcc
14 changed files with 167 additions and 167 deletions
--- a/patches/6.1/0001-surface3-oemb.patch
+++ b/patches/6.1/0001-surface3-oemb.patch
@ -1,4 +1,4 @@
-From eced249cb7e3d0a9354bea00cbfaf9e679b34e19 Mon Sep 17 00:00:00 2001
+From b062a358226ff93e073cf1af2b04fa38011b12fe 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
@ -40,7 +40,7 @@ Patchset: surface3-oemb
 3 files changed, 24 insertions(+)

 diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
-index ca4602bcc7dea..490b9731068ae 100644
+index ca4602bcc7de..490b9731068a 100644
 --- a/drivers/platform/surface/surface3-wmi.c
 +++ b/drivers/platform/surface/surface3-wmi.c
@@ -37,6 +37,13 @@ static const struct dmi_system_id surface3_dmi_table[] = {
@ -58,7 +58,7 @@ index ca4602bcc7dea..490b9731068ae 100644
 	{ }
 };
 diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
-index 620ecbfa4a7a8..b07d06d2971a8 100644
+index 620ecbfa4a7a..b07d06d2971a 100644
 --- a/sound/soc/codecs/rt5645.c
 +++ b/sound/soc/codecs/rt5645.c
@@ -3717,6 +3717,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
@ -78,7 +78,7 @@ index 620ecbfa4a7a8..b07d06d2971a8 100644
 		/*
 		 * Match for the GPDwin which unfortunately uses somewhat
 diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
-index 6beb00858c33f..d82d77387a0a6 100644
+index 6beb00858c33..d82d77387a0a 100644
 --- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
 +++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
@@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = {
--- a/patches/6.1/0002-mwifiex.patch
+++ b/patches/6.1/0002-mwifiex.patch
@ -1,4 +1,4 @@
-From f225b1331cfbf10e6e8660a00ec09de4d62ea300 Mon Sep 17 00:00:00 2001
+From 6098a9e7f7d9437908d780c0555d2c54c2618dab 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
@ -32,7 +32,7 @@ Patchset: mwifiex
 3 files changed, 31 insertions(+), 8 deletions(-)

 diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
-index 9a698a16a8f38..14687342bc81c 100644
+index 9a698a16a8f3..14687342bc81 100644
 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c
 +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -1762,9 +1762,21 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
@ -58,7 +58,7 @@ index 9a698a16a8f38..14687342bc81c 100644
 	if (mwifiex_write_reg(adapter, reg->rx_rdptr, card->rxbd_rdptr |
 			      tx_wrap)) {
 diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
-index dd6d21f1dbfd7..f46b06f8d6435 100644
+index dd6d21f1dbfd..f46b06f8d643 100644
 --- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
 +++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
@@ -13,7 +13,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
@ -151,7 +151,7 @@ index dd6d21f1dbfd7..f46b06f8d6435 100644
 
 static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
 diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
-index d6ff964aec5bf..5d30ae39d65ec 100644
+index d6ff964aec5b..5d30ae39d65e 100644
 --- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
 +++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
@@ -4,6 +4,7 @@
@ -165,7 +165,7 @@ index d6ff964aec5bf..5d30ae39d65ec 100644
 -- 
 2.40.1

-From c486887a70fc1ba227384e9632658a6a7176cd77 Mon Sep 17 00:00:00 2001
+From a6c3d424052350efb88aa02d5486b6f9bd4172d3 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+
@ -187,7 +187,7 @@ Patchset: mwifiex
 3 files changed, 27 insertions(+), 8 deletions(-)

 diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
-index 14687342bc81c..5e1a341f63dff 100644
+index 14687342bc81..5e1a341f63df 100644
 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c
 +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -368,6 +368,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
@ -212,7 +212,7 @@ index 14687342bc81c..5e1a341f63dff 100644
 }
 
 diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
-index f46b06f8d6435..99b024ecbadea 100644
+index f46b06f8d643..99b024ecbade 100644
 --- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
 +++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
@@ -14,7 +14,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
@ -306,7 +306,7 @@ index f46b06f8d6435..99b024ecbadea 100644
 
 static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
 diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
-index 5d30ae39d65ec..c14eb56eb9118 100644
+index 5d30ae39d65e..c14eb56eb911 100644
 --- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
 +++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
@@ -5,6 +5,7 @@
@ -320,7 +320,7 @@ index 5d30ae39d65ec..c14eb56eb9118 100644
 -- 
 2.40.1

-From cb77bf52aa8cd89245366ea98b1f2272fb50f1ae Mon Sep 17 00:00:00 2001
+From 7d40421c8e49ba19f095be2773a2133feaa061fa 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
@ -356,7 +356,7 @@ Patchset: mwifiex
 1 file changed, 15 insertions(+)

 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index faad19b396d50..cc7bb57c4f902 100644
+index faad19b396d5..cc7bb57c4f90 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
@@ -64,6 +64,7 @@ static struct usb_driver btusb_driver;
--- a/patches/6.1/0003-ath10k.patch
+++ b/patches/6.1/0003-ath10k.patch
@ -1,4 +1,4 @@
-From 8c96393cf22f733811bf2d0ec0c2f5ec11d72de8 Mon Sep 17 00:00:00 2001
+From eb669c8c09afdc098857e69996e70bb8e6eaa264 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
@ -20,7 +20,7 @@ Patchset: ath10k
 1 file changed, 58 insertions(+)

 diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
-index 5eb131ab916fd..67f074a126d1f 100644
+index 5eb131ab916f..67f074a126d1 100644
 --- a/drivers/net/wireless/ath/ath10k/core.c
 +++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -38,6 +38,9 @@ static bool fw_diag_log;
--- a/patches/6.1/0004-ipts.patch
+++ b/patches/6.1/0004-ipts.patch
@ -1,4 +1,4 @@
-From 65f0064f0f27146347772173547a04e882ae28cc Mon Sep 17 00:00:00 2001
+From 79b5e888a91fc05c1ec0718db66f61e66d62db43 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
@ -10,7 +10,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 bdc65d50b945f..08723c01d7275 100644
+index bdc65d50b945..08723c01d727 100644
 --- a/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
@@ -92,6 +92,7 @@
@ -22,7 +22,7 @@ index bdc65d50b945f..08723c01d7275 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 5bf0d50d55a00..c13864512229f 100644
+index 5bf0d50d55a0..c13864512229 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[] = {
@ -36,7 +36,7 @@ index 5bf0d50d55a00..c13864512229f 100644
 -- 
 2.40.1

-From 8ae0aac84095ae2cc3d3e1fa9b4db2bd3e2d0395 Mon Sep 17 00:00:00 2001
+From 1c693b9931048643fcd68fa9738ed9ad42aa77da 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
@ -58,7 +58,7 @@ Patchset: ipts
 1 file changed, 24 insertions(+)

 diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index d4b5d20bd6dda..3965979c7bd41 100644
+index d4b5d20bd6dd..3965979c7bd4 100644
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
@@ -37,6 +37,8 @@
@ -136,7 +136,7 @@ index d4b5d20bd6dda..3965979c7bd41 100644
 -- 
 2.40.1

-From abfcbba66a5e871e9a2b476284ab69e9f77d1da1 Mon Sep 17 00:00:00 2001
+From 6ead72ee76e695a3ac8215b74b92be57795ae9da Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sun, 11 Dec 2022 12:00:59 +0100
 Subject: [PATCH] hid: Add support for Intel Precise Touch and Stylus
@ -195,7 +195,7 @@ Patchset: ipts
 create mode 100644 drivers/hid/ipts/thread.h

 diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
-index 185a077d59cdd..1523ccdf73b51 100644
+index 185a077d59cd..1523ccdf73b5 100644
 --- a/drivers/hid/Kconfig
 +++ b/drivers/hid/Kconfig
@@ -1290,4 +1290,6 @@ source "drivers/hid/amd-sfh-hid/Kconfig"
@ -206,7 +206,7 @@ index 185a077d59cdd..1523ccdf73b51 100644
 +
 endmenu
 diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
-index e8014c1a2f8b6..e48300bcea9be 100644
+index e8014c1a2f8b..e48300bcea9b 100644
 --- a/drivers/hid/Makefile
 +++ b/drivers/hid/Makefile
@@ -164,3 +164,5 @@ obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER)	+= intel-ish-hid/
@ -217,7 +217,7 @@ index e8014c1a2f8b6..e48300bcea9be 100644
 +obj-$(CONFIG_HID_IPTS)          += ipts/
 diff --git a/drivers/hid/ipts/Kconfig b/drivers/hid/ipts/Kconfig
 new file mode 100644
-index 0000000000000..297401bd388dd
+index 000000000000..297401bd388d
 --- /dev/null
 +++ b/drivers/hid/ipts/Kconfig
@@ -0,0 +1,14 @@
@ -237,7 +237,7 @@ index 0000000000000..297401bd388dd
 +	  module will be called ipts.
 diff --git a/drivers/hid/ipts/Makefile b/drivers/hid/ipts/Makefile
 new file mode 100644
-index 0000000000000..0fe655bccdc0f
+index 000000000000..0fe655bccdc0
 --- /dev/null
 +++ b/drivers/hid/ipts/Makefile
@@ -0,0 +1,14 @@
@ -257,7 +257,7 @@ index 0000000000000..0fe655bccdc0f
 +ipts-objs += thread.o
 diff --git a/drivers/hid/ipts/cmd.c b/drivers/hid/ipts/cmd.c
 new file mode 100644
-index 0000000000000..7fd69271ccd52
+index 000000000000..7fd69271ccd5
 --- /dev/null
 +++ b/drivers/hid/ipts/cmd.c
@@ -0,0 +1,62 @@
@ -325,7 +325,7 @@ index 0000000000000..7fd69271ccd52
 +}
 diff --git a/drivers/hid/ipts/cmd.h b/drivers/hid/ipts/cmd.h
 new file mode 100644
-index 0000000000000..924758ffee671
+index 000000000000..924758ffee67
 --- /dev/null
 +++ b/drivers/hid/ipts/cmd.h
@@ -0,0 +1,61 @@
@ -392,7 +392,7 @@ index 0000000000000..924758ffee671
 +#endif /* IPTS_CMD_H */
 diff --git a/drivers/hid/ipts/context.h b/drivers/hid/ipts/context.h
 new file mode 100644
-index 0000000000000..3450a95e66ee8
+index 000000000000..3450a95e66ee
 --- /dev/null
 +++ b/drivers/hid/ipts/context.h
@@ -0,0 +1,51 @@
@ -449,7 +449,7 @@ index 0000000000000..3450a95e66ee8
 +#endif /* IPTS_CONTEXT_H */
 diff --git a/drivers/hid/ipts/control.c b/drivers/hid/ipts/control.c
 new file mode 100644
-index 0000000000000..2f61500b5119c
+index 000000000000..2f61500b5119
 --- /dev/null
 +++ b/drivers/hid/ipts/control.c
@@ -0,0 +1,495 @@
@ -950,7 +950,7 @@ index 0000000000000..2f61500b5119c
 +}
 diff --git a/drivers/hid/ipts/control.h b/drivers/hid/ipts/control.h
 new file mode 100644
-index 0000000000000..744bb92d682a0
+index 000000000000..744bb92d682a
 --- /dev/null
 +++ b/drivers/hid/ipts/control.h
@@ -0,0 +1,127 @@
@ -1083,7 +1083,7 @@ index 0000000000000..744bb92d682a0
 +#endif /* IPTS_CONTROL_H */
 diff --git a/drivers/hid/ipts/desc.h b/drivers/hid/ipts/desc.h
 new file mode 100644
-index 0000000000000..c058974a03a1e
+index 000000000000..c058974a03a1
 --- /dev/null
 +++ b/drivers/hid/ipts/desc.h
@@ -0,0 +1,81 @@
@ -1170,7 +1170,7 @@ index 0000000000000..c058974a03a1e
 +#endif /* IPTS_DESC_H */
 diff --git a/drivers/hid/ipts/hid.c b/drivers/hid/ipts/hid.c
 new file mode 100644
-index 0000000000000..6782394e8dde3
+index 000000000000..6782394e8dde
 --- /dev/null
 +++ b/drivers/hid/ipts/hid.c
@@ -0,0 +1,348 @@
@ -1524,7 +1524,7 @@ index 0000000000000..6782394e8dde3
 +}
 diff --git a/drivers/hid/ipts/hid.h b/drivers/hid/ipts/hid.h
 new file mode 100644
-index 0000000000000..62bf3cd486081
+index 000000000000..62bf3cd48608
 --- /dev/null
 +++ b/drivers/hid/ipts/hid.h
@@ -0,0 +1,22 @@
@ -1552,7 +1552,7 @@ index 0000000000000..62bf3cd486081
 +#endif /* IPTS_HID_H */
 diff --git a/drivers/hid/ipts/main.c b/drivers/hid/ipts/main.c
 new file mode 100644
-index 0000000000000..0f20c6c08c38c
+index 000000000000..0f20c6c08c38
 --- /dev/null
 +++ b/drivers/hid/ipts/main.c
@@ -0,0 +1,127 @@
@ -1685,7 +1685,7 @@ index 0000000000000..0f20c6c08c38c
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/hid/ipts/mei.c b/drivers/hid/ipts/mei.c
 new file mode 100644
-index 0000000000000..26666fd99b0c7
+index 000000000000..26666fd99b0c
 --- /dev/null
 +++ b/drivers/hid/ipts/mei.c
@@ -0,0 +1,189 @@
@ -1880,7 +1880,7 @@ index 0000000000000..26666fd99b0c7
 +}
 diff --git a/drivers/hid/ipts/mei.h b/drivers/hid/ipts/mei.h
 new file mode 100644
-index 0000000000000..eadacae54c400
+index 000000000000..eadacae54c40
 --- /dev/null
 +++ b/drivers/hid/ipts/mei.h
@@ -0,0 +1,67 @@
@ -1953,7 +1953,7 @@ index 0000000000000..eadacae54c400
 +#endif /* IPTS_MEI_H */
 diff --git a/drivers/hid/ipts/receiver.c b/drivers/hid/ipts/receiver.c
 new file mode 100644
-index 0000000000000..77234f9e0e178
+index 000000000000..77234f9e0e17
 --- /dev/null
 +++ b/drivers/hid/ipts/receiver.c
@@ -0,0 +1,249 @@
@ -2208,7 +2208,7 @@ index 0000000000000..77234f9e0e178
 +}
 diff --git a/drivers/hid/ipts/receiver.h b/drivers/hid/ipts/receiver.h
 new file mode 100644
-index 0000000000000..96070f34fbcaa
+index 000000000000..96070f34fbca
 --- /dev/null
 +++ b/drivers/hid/ipts/receiver.h
@@ -0,0 +1,17 @@
@ -2231,7 +2231,7 @@ index 0000000000000..96070f34fbcaa
 +#endif /* IPTS_RECEIVER_H */
 diff --git a/drivers/hid/ipts/resources.c b/drivers/hid/ipts/resources.c
 new file mode 100644
-index 0000000000000..80ba5885bb55d
+index 000000000000..80ba5885bb55
 --- /dev/null
 +++ b/drivers/hid/ipts/resources.c
@@ -0,0 +1,108 @@
@ -2345,7 +2345,7 @@ index 0000000000000..80ba5885bb55d
 +}
 diff --git a/drivers/hid/ipts/resources.h b/drivers/hid/ipts/resources.h
 new file mode 100644
-index 0000000000000..6cbb24a8a0543
+index 000000000000..6cbb24a8a054
 --- /dev/null
 +++ b/drivers/hid/ipts/resources.h
@@ -0,0 +1,39 @@
@ -2390,7 +2390,7 @@ index 0000000000000..6cbb24a8a0543
 +#endif /* IPTS_RESOURCES_H */
 diff --git a/drivers/hid/ipts/spec-data.h b/drivers/hid/ipts/spec-data.h
 new file mode 100644
-index 0000000000000..e8dd98895a7ee
+index 000000000000..e8dd98895a7e
 --- /dev/null
 +++ b/drivers/hid/ipts/spec-data.h
@@ -0,0 +1,100 @@
@ -2496,7 +2496,7 @@ index 0000000000000..e8dd98895a7ee
 +#endif /* IPTS_SPEC_DATA_H */
 diff --git a/drivers/hid/ipts/spec-device.h b/drivers/hid/ipts/spec-device.h
 new file mode 100644
-index 0000000000000..93f673d981f7f
+index 000000000000..93f673d981f7
 --- /dev/null
 +++ b/drivers/hid/ipts/spec-device.h
@@ -0,0 +1,285 @@
@ -2787,7 +2787,7 @@ index 0000000000000..93f673d981f7f
 +#endif /* IPTS_SPEC_DEVICE_H */
 diff --git a/drivers/hid/ipts/spec-hid.h b/drivers/hid/ipts/spec-hid.h
 new file mode 100644
-index 0000000000000..ea70f29ff00cb
+index 000000000000..ea70f29ff00c
 --- /dev/null
 +++ b/drivers/hid/ipts/spec-hid.h
@@ -0,0 +1,35 @@
@ -2828,7 +2828,7 @@ index 0000000000000..ea70f29ff00cb
 +#endif /* IPTS_SPEC_HID_H */
 diff --git a/drivers/hid/ipts/thread.c b/drivers/hid/ipts/thread.c
 new file mode 100644
-index 0000000000000..8b46f775c1070
+index 000000000000..8b46f775c107
 --- /dev/null
 +++ b/drivers/hid/ipts/thread.c
@@ -0,0 +1,85 @@
@ -2919,7 +2919,7 @@ index 0000000000000..8b46f775c1070
 +}
 diff --git a/drivers/hid/ipts/thread.h b/drivers/hid/ipts/thread.h
 new file mode 100644
-index 0000000000000..a314843599fc3
+index 000000000000..a314843599fc
 --- /dev/null
 +++ b/drivers/hid/ipts/thread.h
@@ -0,0 +1,60 @@
@ -2986,7 +2986,7 @@ index 0000000000000..a314843599fc3
 -- 
 2.40.1

-From 93162f9a18dfef406d5b7136b1e9179a30909b1f Mon Sep 17 00:00:00 2001
+From b888084d04f4b31d9ef138ecc597b75f7bf028f6 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Fri, 28 Apr 2023 15:41:12 +0200
 Subject: [PATCH] Update IPTS from module repo
@ -3009,7 +3009,7 @@ Patchset: ipts
 4 files changed, 40 insertions(+), 15 deletions(-)

 diff --git a/drivers/hid/ipts/hid.c b/drivers/hid/ipts/hid.c
-index 6782394e8dde3..a2471219615bc 100644
+index 6782394e8dde..a2471219615b 100644
 --- a/drivers/hid/ipts/hid.c
 +++ b/drivers/hid/ipts/hid.c
@@ -237,7 +237,6 @@ static struct hid_ll_driver ipts_hid_driver = {
@ -3063,7 +3063,7 @@ index 6782394e8dde3..a2471219615bc 100644
 	snprintf(ipts->hid->name, sizeof(ipts->hid->name), "IPTS %04X:%04X", info.vendor,
 		 info.product);
 diff --git a/drivers/hid/ipts/receiver.c b/drivers/hid/ipts/receiver.c
-index 77234f9e0e178..f56e9ed32d579 100644
+index 77234f9e0e17..f56e9ed32d57 100644
 --- a/drivers/hid/ipts/receiver.c
 +++ b/drivers/hid/ipts/receiver.c
@@ -42,7 +42,7 @@ static void ipts_receiver_backoff(time64_t last, u32 n)
@ -3076,7 +3076,7 @@ index 77234f9e0e178..f56e9ed32d579 100644
 		msleep(200);
 }
 diff --git a/drivers/hid/ipts/resources.c b/drivers/hid/ipts/resources.c
-index 80ba5885bb55d..5e924d58c4880 100644
+index 80ba5885bb55..5e924d58c488 100644
 --- a/drivers/hid/ipts/resources.c
 +++ b/drivers/hid/ipts/resources.c
@@ -9,6 +9,7 @@
@ -3162,7 +3162,7 @@ index 80ba5885bb55d..5e924d58c4880 100644
 	return 0;
 }
 diff --git a/drivers/hid/ipts/resources.h b/drivers/hid/ipts/resources.h
-index 6cbb24a8a0543..e0c400f420b93 100644
+index 6cbb24a8a054..e0c400f420b9 100644
 --- a/drivers/hid/ipts/resources.h
 +++ b/drivers/hid/ipts/resources.h
@@ -31,6 +31,9 @@ struct ipts_resources {
--- a/patches/6.1/0005-ithc.patch
+++ b/patches/6.1/0005-ithc.patch
@ -1,4 +1,4 @@
-From 6010854e036d959f4e9227799c6a465c5469e55d Mon Sep 17 00:00:00 2001
+From 4fd2a18f8427b5b1211e06ac66329dccf15c54ae Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sun, 11 Dec 2022 12:03:38 +0100
 Subject: [PATCH] iommu: intel: Disable source id verification for ITHC
@ -10,7 +10,7 @@ Patchset: ithc
 1 file changed, 16 insertions(+)

 diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c
-index 5962bb5027d06..86fa129d10d40 100644
+index 5962bb5027d0..86fa129d10d4 100644
 --- a/drivers/iommu/intel/irq_remapping.c
 +++ b/drivers/iommu/intel/irq_remapping.c
@@ -396,6 +396,22 @@ static int set_msi_sid(struct irte *irte, struct pci_dev *dev)
@ -39,7 +39,7 @@ index 5962bb5027d06..86fa129d10d40 100644
 -- 
 2.40.1

-From 3a2b157d755873483a9c931ac960d7df5b36ea62 Mon Sep 17 00:00:00 2001
+From bcafa435dced5e7b1bda79f4c926c299e1705368 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sun, 11 Dec 2022 12:10:54 +0100
 Subject: [PATCH] hid: Add support for Intel Touch Host Controller
@ -72,7 +72,7 @@ Patchset: ithc
 create mode 100644 drivers/hid/ithc/ithc.h

 diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
-index 1523ccdf73b51..b7030071ac0c0 100644
+index 1523ccdf73b5..b7030071ac0c 100644
 --- a/drivers/hid/Kconfig
 +++ b/drivers/hid/Kconfig
@@ -1292,4 +1292,6 @@ source "drivers/hid/surface-hid/Kconfig"
@ -83,7 +83,7 @@ index 1523ccdf73b51..b7030071ac0c0 100644
 +
 endmenu
 diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
-index e48300bcea9be..8ef7308b0f9d7 100644
+index e48300bcea9b..8ef7308b0f9d 100644
 --- a/drivers/hid/Makefile
 +++ b/drivers/hid/Makefile
@@ -166,3 +166,4 @@ obj-$(CONFIG_AMD_SFH_HID)       += amd-sfh-hid/
@ -93,7 +93,7 @@ index e48300bcea9be..8ef7308b0f9d7 100644
 +obj-$(CONFIG_HID_ITHC)          += ithc/
 diff --git a/drivers/hid/ithc/Kbuild b/drivers/hid/ithc/Kbuild
 new file mode 100644
-index 0000000000000..aea83f2ac07b4
+index 000000000000..aea83f2ac07b
 --- /dev/null
 +++ b/drivers/hid/ithc/Kbuild
@@ -0,0 +1,6 @@
@ -105,7 +105,7 @@ index 0000000000000..aea83f2ac07b4
 +
 diff --git a/drivers/hid/ithc/Kconfig b/drivers/hid/ithc/Kconfig
 new file mode 100644
-index 0000000000000..ede7130236096
+index 000000000000..ede713023609
 --- /dev/null
 +++ b/drivers/hid/ithc/Kconfig
@@ -0,0 +1,12 @@
@ -123,7 +123,7 @@ index 0000000000000..ede7130236096
 +	  module will be called ithc.
 diff --git a/drivers/hid/ithc/ithc-debug.c b/drivers/hid/ithc/ithc-debug.c
 new file mode 100644
-index 0000000000000..57bf125c45bd5
+index 000000000000..57bf125c45bd
 --- /dev/null
 +++ b/drivers/hid/ithc/ithc-debug.c
@@ -0,0 +1,96 @@
@ -225,7 +225,7 @@ index 0000000000000..57bf125c45bd5
 +
 diff --git a/drivers/hid/ithc/ithc-dma.c b/drivers/hid/ithc/ithc-dma.c
 new file mode 100644
-index 0000000000000..7e89b3496918d
+index 000000000000..7e89b3496918
 --- /dev/null
 +++ b/drivers/hid/ithc/ithc-dma.c
@@ -0,0 +1,258 @@
@ -489,7 +489,7 @@ index 0000000000000..7e89b3496918d
 +
 diff --git a/drivers/hid/ithc/ithc-dma.h b/drivers/hid/ithc/ithc-dma.h
 new file mode 100644
-index 0000000000000..d9f2c19a13f3a
+index 000000000000..d9f2c19a13f3
 --- /dev/null
 +++ b/drivers/hid/ithc/ithc-dma.h
@@ -0,0 +1,67 @@
@ -562,7 +562,7 @@ index 0000000000000..d9f2c19a13f3a
 +
 diff --git a/drivers/hid/ithc/ithc-main.c b/drivers/hid/ithc/ithc-main.c
 new file mode 100644
-index 0000000000000..09512b9cb4d31
+index 000000000000..09512b9cb4d3
 --- /dev/null
 +++ b/drivers/hid/ithc/ithc-main.c
@@ -0,0 +1,534 @@
@ -1102,7 +1102,7 @@ index 0000000000000..09512b9cb4d31
 +
 diff --git a/drivers/hid/ithc/ithc-regs.c b/drivers/hid/ithc/ithc-regs.c
 new file mode 100644
-index 0000000000000..85d567b05761f
+index 000000000000..85d567b05761
 --- /dev/null
 +++ b/drivers/hid/ithc/ithc-regs.c
@@ -0,0 +1,64 @@
@ -1172,7 +1172,7 @@ index 0000000000000..85d567b05761f
 +
 diff --git a/drivers/hid/ithc/ithc-regs.h b/drivers/hid/ithc/ithc-regs.h
 new file mode 100644
-index 0000000000000..1a96092ed7eed
+index 000000000000..1a96092ed7ee
 --- /dev/null
 +++ b/drivers/hid/ithc/ithc-regs.h
@@ -0,0 +1,186 @@
@ -1364,7 +1364,7 @@ index 0000000000000..1a96092ed7eed
 +
 diff --git a/drivers/hid/ithc/ithc.h b/drivers/hid/ithc/ithc.h
 new file mode 100644
-index 0000000000000..6a9b0d480bc15
+index 000000000000..6a9b0d480bc1
 --- /dev/null
 +++ b/drivers/hid/ithc/ithc.h
@@ -0,0 +1,60 @@
--- a/patches/6.1/0006-surface-sam.patch
+++ b/patches/6.1/0006-surface-sam.patch
@ -1,4 +1,4 @@
-From 7e22a422fcc90fdbe45ae59f341fe7210b854d93 Mon Sep 17 00:00:00 2001
+From dff6b432e197606aba7cdb3ccf4a301621be14ae Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:20 +0100
 Subject: [PATCH] platform/surface: aggregator: Improve documentation and
@ -29,7 +29,7 @@ Patchset: surface-sam
 7 files changed, 64 insertions(+), 47 deletions(-)

 diff --git a/Documentation/driver-api/surface_aggregator/client.rst b/Documentation/driver-api/surface_aggregator/client.rst
-index 27f95abdbe997..9d7411223a848 100644
+index 27f95abdbe99..9d7411223a84 100644
 --- a/Documentation/driver-api/surface_aggregator/client.rst
 +++ b/Documentation/driver-api/surface_aggregator/client.rst
@@ -191,7 +191,7 @@ data received from it is converted from little-endian to host endianness.
@ -51,7 +51,7 @@ index 27f95abdbe997..9d7411223a848 100644
            .instance_id     = 0x00,
    });
 diff --git a/Documentation/driver-api/surface_aggregator/ssh.rst b/Documentation/driver-api/surface_aggregator/ssh.rst
-index bf007d6c98732..18fd0f0aee84b 100644
+index bf007d6c9873..18fd0f0aee84 100644
 --- a/Documentation/driver-api/surface_aggregator/ssh.rst
 +++ b/Documentation/driver-api/surface_aggregator/ssh.rst
@@ -13,6 +13,7 @@
@ -115,7 +115,7 @@ index bf007d6c98732..18fd0f0aee84b 100644
 
 Limitations and Observations
 diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c
-index c6537a1b3a2ec..2c99f51ccd4ec 100644
+index c6537a1b3a2e..2c99f51ccd4e 100644
 --- a/drivers/platform/surface/aggregator/controller.c
 +++ b/drivers/platform/surface/aggregator/controller.c
@@ -994,7 +994,7 @@ static void ssam_handle_event(struct ssh_rtl *rtl,
@ -169,7 +169,7 @@ index c6537a1b3a2ec..2c99f51ccd4ec 100644
 	.instance_id     = 0x00,
 });
 diff --git a/drivers/platform/surface/aggregator/ssh_msgb.h b/drivers/platform/surface/aggregator/ssh_msgb.h
-index f3ecad92eefd8..438873e060986 100644
+index f3ecad92eefd..438873e06098 100644
 --- a/drivers/platform/surface/aggregator/ssh_msgb.h
 +++ b/drivers/platform/surface/aggregator/ssh_msgb.h
@@ -189,8 +189,8 @@ static inline void msgb_push_cmd(struct msgbuf *msgb, u8 seq, u16 rqid,
@ -184,7 +184,7 @@ index f3ecad92eefd8..438873e060986 100644
 	__msgb_push_u16(msgb, rqid);			/* Request ID. */
 	__msgb_push_u8(msgb, rqst->command_id);		/* Command ID. */
 diff --git a/drivers/platform/surface/aggregator/ssh_request_layer.c b/drivers/platform/surface/aggregator/ssh_request_layer.c
-index 69132976d297e..90634dcacabf2 100644
+index 69132976d297..90634dcacabf 100644
 --- a/drivers/platform/surface/aggregator/ssh_request_layer.c
 +++ b/drivers/platform/surface/aggregator/ssh_request_layer.c
@@ -920,13 +920,14 @@ static void ssh_rtl_rx_command(struct ssh_ptl *p, const struct ssam_span *data)
@ -208,7 +208,7 @@ index 69132976d297e..90634dcacabf2 100644
 	}
 
 diff --git a/include/linux/surface_aggregator/controller.h b/include/linux/surface_aggregator/controller.h
-index d11a1c6e3186a..8932bc0bae187 100644
+index d11a1c6e3186..8932bc0bae18 100644
 --- a/include/linux/surface_aggregator/controller.h
 +++ b/include/linux/surface_aggregator/controller.h
@@ -912,10 +912,10 @@ enum ssam_event_mask {
@ -225,7 +225,7 @@ index d11a1c6e3186a..8932bc0bae187 100644
 #define SSAM_EVENT_REGISTRY_REG(tid)\
 	SSAM_EVENT_REGISTRY(SSAM_SSH_TC_REG, tid, 0x01, 0x02)
 diff --git a/include/linux/surface_aggregator/serial_hub.h b/include/linux/surface_aggregator/serial_hub.h
-index 45501b6e54e8a..5c4ae1a261831 100644
+index 45501b6e54e8..5c4ae1a26183 100644
 --- a/include/linux/surface_aggregator/serial_hub.h
 +++ b/include/linux/surface_aggregator/serial_hub.h
@@ -83,23 +83,21 @@ enum ssh_payload_type {
@ -289,7 +289,7 @@ index 45501b6e54e8a..5c4ae1a261831 100644
 -- 
 2.40.1

-From e3c9b579d14240284659f9007e2ffd1f8eead49e Mon Sep 17 00:00:00 2001
+From 3a9db4941d9e4bca45ae4f8176961c4b80fd0726 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:21 +0100
 Subject: [PATCH] platform/surface: aggregator: Add target and source IDs to
@ -314,7 +314,7 @@ Patchset: surface-sam
 1 file changed, 67 insertions(+), 6 deletions(-)

 diff --git a/drivers/platform/surface/aggregator/trace.h b/drivers/platform/surface/aggregator/trace.h
-index 2a2c17771d014..55cc61bba1da6 100644
+index 2a2c17771d01..55cc61bba1da 100644
 --- a/drivers/platform/surface/aggregator/trace.h
 +++ b/drivers/platform/surface/aggregator/trace.h
@@ -96,6 +96,7 @@ TRACE_DEFINE_ENUM(SSAM_SSH_TC_POS);
@ -486,7 +486,7 @@ index 2a2c17771d014..55cc61bba1da6 100644
 -- 
 2.40.1

-From f9ee74f0c2ec3d2d4759d60c81c0deadc7bdcc74 Mon Sep 17 00:00:00 2001
+From df6ce87d6d357a6cee359b4b02b49e7566f0ab43 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:22 +0100
 Subject: [PATCH] platform/surface: aggregator_hub: Use target-ID enum instead
@ -505,7 +505,7 @@ Patchset: surface-sam
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/drivers/platform/surface/surface_aggregator_hub.c b/drivers/platform/surface/surface_aggregator_hub.c
-index 43061514be382..62f27cdb6ca8f 100644
+index 43061514be38..62f27cdb6ca8 100644
 --- a/drivers/platform/surface/surface_aggregator_hub.c
 +++ b/drivers/platform/surface/surface_aggregator_hub.c
@@ -214,7 +214,7 @@ static void ssam_hub_remove(struct ssam_device *sdev)
@ -529,7 +529,7 @@ index 43061514be382..62f27cdb6ca8f 100644
 -- 
 2.40.1

-From dfd37dd09ee90bf02b6c61ba0cb8eac492855054 Mon Sep 17 00:00:00 2001
+From f018b06c9d315e558d6d56ad8400134491ff369f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:23 +0100
 Subject: [PATCH] platform/surface: aggregator_tabletsw: Use target-ID enum
@ -548,7 +548,7 @@ Patchset: surface-sam
 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
-index 27d95a6a78513..bd8cd453c393a 100644
+index 27d95a6a7851..bd8cd453c393 100644
 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c
 +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -247,7 +247,7 @@ static bool ssam_kip_cover_state_is_tablet_mode(struct ssam_tablet_sw *sw, u32 s
@ -581,7 +581,7 @@ index 27d95a6a78513..bd8cd453c393a 100644
 -- 
 2.40.1

-From 3a6d3b3baf07034a966fcdf38ef4d8b74bb7a0c8 Mon Sep 17 00:00:00 2001
+From 0d2cd5004e318a315360e4215f45bf4f6bd273a2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:24 +0100
 Subject: [PATCH] platform/surface: dtx: Use target-ID enum instead of
@ -600,7 +600,7 @@ Patchset: surface-sam
 1 file changed, 9 insertions(+), 9 deletions(-)

 diff --git a/drivers/platform/surface/surface_dtx.c b/drivers/platform/surface/surface_dtx.c
-index ed36944467f9f..0de76a784a35f 100644
+index ed36944467f9..0de76a784a35 100644
 --- a/drivers/platform/surface/surface_dtx.c
 +++ b/drivers/platform/surface/surface_dtx.c
@@ -71,63 +71,63 @@ static_assert(sizeof(struct ssam_bas_base_info) == 2);
@ -679,7 +679,7 @@ index ed36944467f9f..0de76a784a35f 100644
 -- 
 2.40.1

-From 24a096b898dffc0bd93f966ccb62fd7a00fa0b48 Mon Sep 17 00:00:00 2001
+From bf7bfdc6185eb316e309d3c7ee28f2528bd351e5 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:25 +0100
 Subject: [PATCH] HID: surface-hid: Use target-ID enum instead of hard-coding
@ -698,7 +698,7 @@ Patchset: surface-sam
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/drivers/hid/surface-hid/surface_kbd.c b/drivers/hid/surface-hid/surface_kbd.c
-index 0635341bc5174..42933bf3e925f 100644
+index 0635341bc517..42933bf3e925 100644
 --- a/drivers/hid/surface-hid/surface_kbd.c
 +++ b/drivers/hid/surface-hid/surface_kbd.c
@@ -250,7 +250,7 @@ static int surface_kbd_probe(struct platform_device *pdev)
@ -713,7 +713,7 @@ index 0635341bc5174..42933bf3e925f 100644
 -- 
 2.40.1

-From eb5b8a2165e5dc9cd8d0b87373cdc60c32ec77e7 Mon Sep 17 00:00:00 2001
+From cd0ed86db9090b9eeab3ea08a2bc1db209f4a790 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:26 +0100
 Subject: [PATCH] platform/surface: aggregator: Enforce use of target-ID enum
@ -747,7 +747,7 @@ Patchset: surface-sam
 8 files changed, 35 insertions(+), 35 deletions(-)

 diff --git a/drivers/hid/surface-hid/surface_hid.c b/drivers/hid/surface-hid/surface_hid.c
-index d4aa8c81903ae..aa80d83a83d1b 100644
+index d4aa8c81903a..aa80d83a83d1 100644
 --- a/drivers/hid/surface-hid/surface_hid.c
 +++ b/drivers/hid/surface-hid/surface_hid.c
@@ -230,7 +230,7 @@ static void surface_hid_remove(struct ssam_device *sdev)
@ -760,7 +760,7 @@ index d4aa8c81903ae..aa80d83a83d1b 100644
 };
 MODULE_DEVICE_TABLE(ssam, surface_hid_match);
 diff --git a/drivers/platform/surface/surface_aggregator_hub.c b/drivers/platform/surface/surface_aggregator_hub.c
-index 62f27cdb6ca8f..6abd1efe20883 100644
+index 62f27cdb6ca8..6abd1efe2088 100644
 --- a/drivers/platform/surface/surface_aggregator_hub.c
 +++ b/drivers/platform/surface/surface_aggregator_hub.c
@@ -348,8 +348,8 @@ static const struct ssam_hub_desc kip_hub = {
@ -775,7 +775,7 @@ index 62f27cdb6ca8f..6abd1efe20883 100644
 };
 MODULE_DEVICE_TABLE(ssam, ssam_hub_match);
 diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
-index bd8cd453c393a..6147aa8879391 100644
+index bd8cd453c393..6147aa887939 100644
 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c
 +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -510,8 +510,8 @@ static const struct ssam_tablet_sw_desc ssam_pos_sw_desc = {
@ -790,7 +790,7 @@ index bd8cd453c393a..6147aa8879391 100644
 };
 MODULE_DEVICE_TABLE(ssam, ssam_tablet_sw_match);
 diff --git a/drivers/platform/surface/surface_dtx.c b/drivers/platform/surface/surface_dtx.c
-index 0de76a784a35f..30cbde278c599 100644
+index 0de76a784a35..30cbde278c59 100644
 --- a/drivers/platform/surface/surface_dtx.c
 +++ b/drivers/platform/surface/surface_dtx.c
@@ -1214,7 +1214,7 @@ static void surface_dtx_ssam_remove(struct ssam_device *sdev)
@ -803,7 +803,7 @@ index 0de76a784a35f..30cbde278c599 100644
 };
 MODULE_DEVICE_TABLE(ssam, surface_dtx_ssam_match);
 diff --git a/drivers/platform/surface/surface_platform_profile.c b/drivers/platform/surface/surface_platform_profile.c
-index fbf2e11fd6ce7..f433a13c3689a 100644
+index fbf2e11fd6ce..f433a13c3689 100644
 --- a/drivers/platform/surface/surface_platform_profile.c
 +++ b/drivers/platform/surface/surface_platform_profile.c
@@ -169,7 +169,7 @@ static void surface_platform_profile_remove(struct ssam_device *sdev)
@ -816,7 +816,7 @@ index fbf2e11fd6ce7..f433a13c3689a 100644
 };
 MODULE_DEVICE_TABLE(ssam, ssam_platform_profile_match);
 diff --git a/drivers/power/supply/surface_battery.c b/drivers/power/supply/surface_battery.c
-index 540707882bb0a..19d2f8834e56d 100644
+index 540707882bb0..19d2f8834e56 100644
 --- a/drivers/power/supply/surface_battery.c
 +++ b/drivers/power/supply/surface_battery.c
@@ -852,8 +852,8 @@ static const struct spwr_psy_properties spwr_psy_props_bat2_sb3 = {
@ -831,7 +831,7 @@ index 540707882bb0a..19d2f8834e56d 100644
 };
 MODULE_DEVICE_TABLE(ssam, surface_battery_match);
 diff --git a/drivers/power/supply/surface_charger.c b/drivers/power/supply/surface_charger.c
-index 59182d55742d0..cabdd8da12d08 100644
+index 59182d55742d..cabdd8da12d0 100644
 --- a/drivers/power/supply/surface_charger.c
 +++ b/drivers/power/supply/surface_charger.c
@@ -260,7 +260,7 @@ static const struct spwr_psy_properties spwr_psy_props_adp1 = {
@ -844,7 +844,7 @@ index 59182d55742d0..cabdd8da12d08 100644
 };
 MODULE_DEVICE_TABLE(ssam, surface_ac_match);
 diff --git a/include/linux/surface_aggregator/device.h b/include/linux/surface_aggregator/device.h
-index 46c45d1b63682..4da20b7a0ee5e 100644
+index 46c45d1b6368..4da20b7a0ee5 100644
 --- a/include/linux/surface_aggregator/device.h
 +++ b/include/linux/surface_aggregator/device.h
@@ -68,9 +68,9 @@ struct ssam_device_uid {
@ -949,7 +949,7 @@ index 46c45d1b63682..4da20b7a0ee5e 100644
 -- 
 2.40.1

-From ed1cdab50327d6b4b4ba40bcfb2772b9ca3984bd Mon Sep 17 00:00:00 2001
+From 637cfbc3fa26dd8f2e9cf2ecd89120d296f1d22a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:27 +0100
 Subject: [PATCH] platform/surface: aggregator_registry: Fix target-ID of
@ -976,7 +976,7 @@ Patchset: surface-sam
 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/drivers/platform/surface/surface_aggregator_hub.c b/drivers/platform/surface/surface_aggregator_hub.c
-index 6abd1efe20883..8b8b80228c147 100644
+index 6abd1efe2088..8b8b80228c14 100644
 --- a/drivers/platform/surface/surface_aggregator_hub.c
 +++ b/drivers/platform/surface/surface_aggregator_hub.c
@@ -349,7 +349,7 @@ static const struct ssam_hub_desc kip_hub = {
@ -989,7 +989,7 @@ index 6abd1efe20883..8b8b80228c147 100644
 };
 MODULE_DEVICE_TABLE(ssam, ssam_hub_match);
 diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
-index 023f126121d7d..296f72d52e6a6 100644
+index 023f126121d7..296f72d52e6a 100644
 --- a/drivers/platform/surface/surface_aggregator_registry.c
 +++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -46,7 +46,7 @@ static const struct software_node ssam_node_hub_kip = {
@ -1004,7 +1004,7 @@ index 023f126121d7d..296f72d52e6a6 100644
 -- 
 2.40.1

-From d664a31296df14c3385d6d162ce8e1e7352a3935 Mon Sep 17 00:00:00 2001
+From c8063be2d5332cbe2e212e8772030d2704da4a7b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 20 Dec 2022 18:56:08 +0100
 Subject: [PATCH] platform/surface: aggregator: Rename top-level request
@ -1060,7 +1060,7 @@ Patchset: surface-sam
 10 files changed, 66 insertions(+), 66 deletions(-)

 diff --git a/Documentation/driver-api/surface_aggregator/client.rst b/Documentation/driver-api/surface_aggregator/client.rst
-index 9d7411223a848..e100ab0a24cc4 100644
+index 9d7411223a84..e100ab0a24cc 100644
 --- a/Documentation/driver-api/surface_aggregator/client.rst
 +++ b/Documentation/driver-api/surface_aggregator/client.rst
@@ -19,7 +19,7 @@
@ -1097,7 +1097,7 @@ index 9d7411223a848..e100ab0a24cc4 100644
 implementation and documentation for more details.
 
 diff --git a/drivers/hid/surface-hid/surface_hid.c b/drivers/hid/surface-hid/surface_hid.c
-index aa80d83a83d1b..61e5814b0ad7d 100644
+index aa80d83a83d1..61e5814b0ad7 100644
 --- a/drivers/hid/surface-hid/surface_hid.c
 +++ b/drivers/hid/surface-hid/surface_hid.c
@@ -80,7 +80,7 @@ static int ssam_hid_get_descriptor(struct surface_hid_device *shid, u8 entry, u8
@ -1128,7 +1128,7 @@ index aa80d83a83d1b..61e5814b0ad7d 100644
 
 static u32 ssam_hid_event_fn(struct ssam_event_notifier *nf, const struct ssam_event *event)
 diff --git a/drivers/hid/surface-hid/surface_kbd.c b/drivers/hid/surface-hid/surface_kbd.c
-index 42933bf3e925f..4fbce201db6a1 100644
+index 42933bf3e925..4fbce201db6a 100644
 --- a/drivers/hid/surface-hid/surface_kbd.c
 +++ b/drivers/hid/surface-hid/surface_kbd.c
@@ -49,7 +49,7 @@ static int ssam_kbd_get_descriptor(struct surface_hid_device *shid, u8 entry, u8
@ -1159,7 +1159,7 @@ index 42933bf3e925f..4fbce201db6a1 100644
 		return status;
 
 diff --git a/drivers/platform/surface/aggregator/bus.c b/drivers/platform/surface/aggregator/bus.c
-index b501a79f2a08a..da0baba5ed51f 100644
+index b501a79f2a08..da0baba5ed51 100644
 --- a/drivers/platform/surface/aggregator/bus.c
 +++ b/drivers/platform/surface/aggregator/bus.c
@@ -136,9 +136,9 @@ int ssam_device_add(struct ssam_device *sdev)
@ -1176,7 +1176,7 @@ index b501a79f2a08a..da0baba5ed51f 100644
 	 * Note that for this to work, the controller has to be a parent device.
 	 * If it is not a direct parent, care has to be taken that the device is
 diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c
-index 2c99f51ccd4ec..535581c0471c5 100644
+index 2c99f51ccd4e..535581c0471c 100644
 --- a/drivers/platform/surface/aggregator/controller.c
 +++ b/drivers/platform/surface/aggregator/controller.c
@@ -1674,7 +1674,7 @@ int ssam_request_sync_submit(struct ssam_controller *ctrl,
@ -1259,7 +1259,7 @@ index 2c99f51ccd4ec..535581c0471c5 100644
 
 	return status < 0 ? status : buf;
 diff --git a/drivers/platform/surface/surface_acpi_notify.c b/drivers/platform/surface/surface_acpi_notify.c
-index 50500e562963d..897cdd9c3aae8 100644
+index 50500e562963..897cdd9c3aae 100644
 --- a/drivers/platform/surface/surface_acpi_notify.c
 +++ b/drivers/platform/surface/surface_acpi_notify.c
@@ -590,7 +590,7 @@ static acpi_status san_rqst(struct san_data *d, struct gsb_buffer *buffer)
@ -1272,7 +1272,7 @@ index 50500e562963d..897cdd9c3aae8 100644
 
 	if (!status) {
 diff --git a/drivers/platform/surface/surface_aggregator_cdev.c b/drivers/platform/surface/surface_aggregator_cdev.c
-index 492c82e691827..07f0ed658369b 100644
+index 492c82e69182..07f0ed658369 100644
 --- a/drivers/platform/surface/surface_aggregator_cdev.c
 +++ b/drivers/platform/surface/surface_aggregator_cdev.c
@@ -302,8 +302,8 @@ static long ssam_cdev_request(struct ssam_cdev_client *client, struct ssam_cdev_
@ -1296,7 +1296,7 @@ index 492c82e691827..07f0ed658369b 100644
 		goto out;
 
 diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
-index 6147aa8879391..9fed800c7cc09 100644
+index 6147aa887939..9fed800c7cc0 100644
 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c
 +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -382,7 +382,7 @@ static int ssam_pos_get_sources_list(struct ssam_tablet_sw *sw, struct ssam_sour
@ -1309,7 +1309,7 @@ index 6147aa8879391..9fed800c7cc09 100644
 		return status;
 
 diff --git a/include/linux/surface_aggregator/controller.h b/include/linux/surface_aggregator/controller.h
-index 8932bc0bae187..cb7980805920a 100644
+index 8932bc0bae18..cb7980805920 100644
 --- a/include/linux/surface_aggregator/controller.h
 +++ b/include/linux/surface_aggregator/controller.h
@@ -207,17 +207,17 @@ static inline int ssam_request_sync_wait(struct ssam_request_sync *rqst)
@ -1509,7 +1509,7 @@ index 8932bc0bae187..cb7980805920a 100644
 			return status;						\
 										\
 diff --git a/include/linux/surface_aggregator/device.h b/include/linux/surface_aggregator/device.h
-index 4da20b7a0ee5e..1545e5567b152 100644
+index 4da20b7a0ee5..1545e5567b15 100644
 --- a/include/linux/surface_aggregator/device.h
 +++ b/include/linux/surface_aggregator/device.h
@@ -456,7 +456,7 @@ static inline int ssam_device_register_clients(struct ssam_device *sdev)
@ -1551,7 +1551,7 @@ index 4da20b7a0ee5e..1545e5567b152 100644
 -- 
 2.40.1

-From 34f0427c5cef627c74d28c90ab7be819d606851a Mon Sep 17 00:00:00 2001
+From 5bf0577ccb7c7906daa47f2e6f1d76852ea6ca11 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Wed, 18 Jan 2023 11:38:23 +0200
 Subject: [PATCH] platform/surface: Switch to use acpi_evaluate_dsm_typed()
@ -1570,7 +1570,7 @@ Patchset: surface-sam
 1 file changed, 3 insertions(+), 10 deletions(-)

 diff --git a/drivers/platform/surface/surface_hotplug.c b/drivers/platform/surface/surface_hotplug.c
-index f004a24952013..7b6d887dccdbf 100644
+index f004a2495201..7b6d887dccdb 100644
 --- a/drivers/platform/surface/surface_hotplug.c
 +++ b/drivers/platform/surface/surface_hotplug.c
@@ -101,18 +101,12 @@ static void shps_dsm_notify_irq(struct platform_device *pdev, enum shps_irq_type
@ -1607,7 +1607,7 @@ index f004a24952013..7b6d887dccdbf 100644
 -- 
 2.40.1

-From 4f89a89a5fb6103e02c7ce5e91b1307f03918b0a Mon Sep 17 00:00:00 2001
+From 39e34980281618fd5e2b3fb430b9757e8e3ad2f4 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 4 Mar 2023 20:09:36 +0100
 Subject: [PATCH] platform/surface: aggregator_tabletsw: Properly handle
@ -1634,7 +1634,7 @@ Patchset: surface-sam
 1 file changed, 84 insertions(+), 39 deletions(-)

 diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
-index 9fed800c7cc09..e8682f52558f3 100644
+index 9fed800c7cc0..e8682f52558f 100644
 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c
 +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -20,16 +20,23 @@
@ -1915,7 +1915,7 @@ index 9fed800c7cc09..e8682f52558f3 100644
 -- 
 2.40.1

-From ee46ef7a758c3241decb5d3d8ce8834ba67ead8d Mon Sep 17 00:00:00 2001
+From fdfc3220abedc75d4ff64900d366ca4b2a0ec4fe Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 19 Feb 2023 23:33:43 +0100
 Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for
@ -1931,7 +1931,7 @@ Patchset: surface-sam
 1 file changed, 57 insertions(+)

 diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
-index e8682f52558f3..8f52b62d1c195 100644
+index e8682f52558f..8f52b62d1c19 100644
 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c
 +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -325,9 +325,18 @@ MODULE_PARM_DESC(tablet_mode_in_slate_state, "Enable tablet mode in slate device
@ -2032,7 +2032,7 @@ index e8682f52558f3..8f52b62d1c195 100644
 -- 
 2.40.1

-From 6ef1eea82ca977da17d29210146fdd9ced15297e Mon Sep 17 00:00:00 2001
+From 2f28e34fa6715ae3b4e4e35afc09bbe73d4dd24f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 19 Feb 2023 23:41:18 +0100
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for
@ -2048,7 +2048,7 @@ Patchset: surface-sam
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
-index 296f72d52e6a6..0fe5be5396525 100644
+index 296f72d52e6a..0fe5be539652 100644
 --- a/drivers/platform/surface/surface_aggregator_registry.c
 +++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -305,7 +305,7 @@ static const struct software_node *ssam_node_group_sp9[] = {
@ -2063,7 +2063,7 @@ index 296f72d52e6a6..0fe5be5396525 100644
 -- 
 2.40.1

-From 6f3127a0922f7138ced9c31235a29594ffa202d7 Mon Sep 17 00:00:00 2001
+From b94c7207a430d250cb344a45f90f94b3f20c5478 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 3 May 2023 02:02:21 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow completion work-items to
@ -2108,7 +2108,7 @@ Patchset: surface-sam
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c
-index 535581c0471c5..7fc602e01487d 100644
+index 535581c0471c..7fc602e01487 100644
 --- a/drivers/platform/surface/aggregator/controller.c
 +++ b/drivers/platform/surface/aggregator/controller.c
@@ -825,7 +825,7 @@ static int ssam_cplt_init(struct ssam_cplt *cplt, struct device *dev)
@ -2123,7 +2123,7 @@ index 535581c0471c5..7fc602e01487d 100644
 -- 
 2.40.1

-From 5aa232816ebdc68be4247adfbad7fd6734ec2284 Mon Sep 17 00:00:00 2001
+From 448e566463e65c9f3cf6ae5c09d06dcb29f878dd Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 18 May 2023 22:53:12 +0200
 Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for book
@ -2145,7 +2145,7 @@ Patchset: surface-sam
 1 file changed, 5 insertions(+)

 diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
-index 8f52b62d1c195..4a029f5db20a9 100644
+index 8f52b62d1c19..4a029f5db20a 100644
 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c
 +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -210,6 +210,7 @@ enum ssam_kip_cover_state {
@ -2177,7 +2177,7 @@ index 8f52b62d1c195..4a029f5db20a9 100644
 -- 
 2.40.1

-From 8a5a9e00b948eb354013c5b1933ae6be9ff0309c Mon Sep 17 00:00:00 2001
+From c8771f84f3b49e4a1f56653cf7feb4818831dc86 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 18 May 2023 22:57:17 +0200
 Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for book
@ -2199,7 +2199,7 @@ Patchset: surface-sam
 1 file changed, 5 insertions(+)

 diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
-index 4a029f5db20a9..c0a1a5869246e 100644
+index 4a029f5db20a..c0a1a5869246 100644
 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c
 +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -340,6 +340,7 @@ enum ssam_pos_state_cover {
--- a/patches/6.1/0007-surface-sam-over-hid.patch
+++ b/patches/6.1/0007-surface-sam-over-hid.patch
@ -1,4 +1,4 @@
-From 247d5d23c6a41361af409b817cca0e261410cbc6 Mon Sep 17 00:00:00 2001
+From 8d667f7302921a2941ded0dd79c0ceb48327fbe0 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
@ -55,7 +55,7 @@ Patchset: surface-sam-over-hid
 1 file changed, 35 insertions(+)

 diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
-index 4dd777cc0c89f..b2338618163ad 100644
+index 4dd777cc0c89..b2338618163a 100644
 --- a/drivers/i2c/i2c-core-acpi.c
 +++ b/drivers/i2c/i2c-core-acpi.c
@@ -639,6 +639,28 @@ static int acpi_gsb_i2c_write_bytes(struct i2c_client *client,
@ -110,7 +110,7 @@ index 4dd777cc0c89f..b2338618163ad 100644
 -- 
 2.40.1

-From c38b19b160a4b94dd2daa9a669283e5961c9f4a9 Mon Sep 17 00:00:00 2001
+From 21924fb67904eeba63c6ffc69b4927a522d77c8b 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
@ -133,7 +133,7 @@ Patchset: surface-sam-over-hid
 create mode 100644 drivers/platform/surface/surfacebook1_dgpu_switch.c

 diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig
-index b629e82af97c0..68656e8f309ed 100644
+index b629e82af97c..68656e8f309e 100644
 --- a/drivers/platform/surface/Kconfig
 +++ b/drivers/platform/surface/Kconfig
@@ -149,6 +149,13 @@ config SURFACE_AGGREGATOR_TABLET_SWITCH
@ -151,7 +151,7 @@ index b629e82af97c0..68656e8f309ed 100644
 	tristate "Surface DTX (Detachment System) Driver"
 	depends on SURFACE_AGGREGATOR
 diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
-index 53344330939bf..7efcd0cdb5329 100644
+index 53344330939b..7efcd0cdb532 100644
 --- a/drivers/platform/surface/Makefile
 +++ b/drivers/platform/surface/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_SURFACE_AGGREGATOR_CDEV)	+= surface_aggregator_cdev.o
@ -164,7 +164,7 @@ index 53344330939bf..7efcd0cdb5329 100644
 obj-$(CONFIG_SURFACE_HOTPLUG)		+= surface_hotplug.o
 diff --git a/drivers/platform/surface/surfacebook1_dgpu_switch.c b/drivers/platform/surface/surfacebook1_dgpu_switch.c
 new file mode 100644
-index 0000000000000..8b816ed8f35c6
+index 000000000000..8b816ed8f35c
 --- /dev/null
 +++ b/drivers/platform/surface/surfacebook1_dgpu_switch.c
@@ -0,0 +1,162 @@
--- a/patches/6.1/0008-surface-button.patch
+++ b/patches/6.1/0008-surface-button.patch
@ -1,4 +1,4 @@
-From ec0bad4bab04ae9bb028add61be5a90f99c5edf3 Mon Sep 17 00:00:00 2001
+From b2ff68b36382b24556f2fa76e93ab6cf137fe079 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
@ -20,7 +20,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 09489380afda7..0f02411a60f1c 100644
+index 09489380afda..0f02411a60f1 100644
 --- a/drivers/input/misc/soc_button_array.c
 +++ b/drivers/input/misc/soc_button_array.c
@@ -507,8 +507,8 @@ static const struct soc_device_data soc_device_MSHW0028 = {
@ -75,7 +75,7 @@ index 09489380afda7..0f02411a60f1c 100644
 -- 
 2.40.1

-From 3420bc3ca3b9c60dfd3c45a7c8d92b8aa6df5305 Mon Sep 17 00:00:00 2001
+From e74a226ff06a157120645ef0d0b8d40c218b3d04 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
@ -96,7 +96,7 @@ Patchset: surface-button
 1 file changed, 6 insertions(+), 24 deletions(-)

 diff --git a/drivers/platform/surface/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c
-index 242fb690dcaf7..30eea54dbb477 100644
+index 242fb690dcaf..30eea54dbb47 100644
 --- a/drivers/platform/surface/surfacepro3_button.c
 +++ b/drivers/platform/surface/surfacepro3_button.c
@@ -149,7 +149,8 @@ static int surface_button_resume(struct device *dev)
--- a/patches/6.1/0009-surface-typecover.patch
+++ b/patches/6.1/0009-surface-typecover.patch
@ -1,4 +1,4 @@
-From 01c7a2bcb649d6dcd18da37cd3719a3cdf75a19b Mon Sep 17 00:00:00 2001
+From 13974a5ec1b064248ffea9995298dadeaf4d939e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 18 Feb 2023 01:02:49 +0100
 Subject: [PATCH] USB: quirks: Add USB_QUIRK_DELAY_INIT for Surface Go 3
@ -23,7 +23,7 @@ Patchset: surface-typecover
 1 file changed, 3 insertions(+)

 diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 934b3d997702e..2c6604c6e8e12 100644
+index 934b3d997702..2c6604c6e8e1 100644
 --- a/drivers/usb/core/quirks.c
 +++ b/drivers/usb/core/quirks.c
@@ -220,6 +220,9 @@ static const struct usb_device_id usb_quirk_list[] = {
@ -39,7 +39,7 @@ index 934b3d997702e..2c6604c6e8e12 100644
 -- 
 2.40.1

-From 073ca09c36229ee06f2a417abade3a5695de25e9 Mon Sep 17 00:00:00 2001
+From bc79d7356a5adbb862c2b65d2cdc713e3fd6aea2 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
@ -75,7 +75,7 @@ Patchset: surface-typecover
 1 file changed, 98 insertions(+), 2 deletions(-)

 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index e31be0cb8b850..63fd042aba6ba 100644
+index e31be0cb8b85..63fd042aba6b 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
@@ -34,7 +34,10 @@
@ -272,7 +272,7 @@ index e31be0cb8b850..63fd042aba6ba 100644
 -- 
 2.40.1

-From f5b20d491eae69bdfea4e7e830ad1643483a4d15 Mon Sep 17 00:00:00 2001
+From d65c4f23ce20f7a73e614bb43b08600e4bc3cea6 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
@ -301,7 +301,7 @@ Patchset: surface-typecover
 1 file changed, 122 insertions(+), 26 deletions(-)

 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 63fd042aba6ba..508a250ff4bf1 100644
+index 63fd042aba6b..508a250ff4bf 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
@@ -77,6 +77,7 @@ MODULE_LICENSE("GPL");
--- a/patches/6.1/0010-surface-shutdown.patch
+++ b/patches/6.1/0010-surface-shutdown.patch
@ -1,4 +1,4 @@
-From c6f863ec9d690c64ee1478a40df279cf643fc89f Mon Sep 17 00:00:00 2001
+From 7fa1affcf27e00e5b6a785a501839b240716c60f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 19 Feb 2023 22:12:24 +0100
 Subject: [PATCH] PCI: Add quirk to prevent calling shutdown mehtod
@ -23,7 +23,7 @@ Patchset: surface-shutdown
 3 files changed, 40 insertions(+)

 diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
-index f47a3b10bf504..9ea4352aac56c 100644
+index f47a3b10bf50..9ea4352aac56 100644
 --- a/drivers/pci/pci-driver.c
 +++ b/drivers/pci/pci-driver.c
@@ -507,6 +507,9 @@ static void pci_device_shutdown(struct device *dev)
@ -37,7 +37,7 @@ index f47a3b10bf504..9ea4352aac56c 100644
 
 	if (drv && drv->shutdown)
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 8d32a3834688f..3ebeaf2968862 100644
+index 8d32a3834688..3ebeaf296886 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
@@ -6028,3 +6028,39 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2d, dpc_log_size);
@ -81,7 +81,7 @@ index 8d32a3834688f..3ebeaf2968862 100644
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x466d, quirk_no_shutdown);  // Thunderbolt 4 NHI
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x46a8, quirk_no_shutdown);  // GPU
 diff --git a/include/linux/pci.h b/include/linux/pci.h
-index d20695184e0b9..e0d4ff7f154a9 100644
+index d20695184e0b..e0d4ff7f154a 100644
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
@@ -462,6 +462,7 @@ struct pci_dev {
--- a/patches/6.1/0011-surface-gpe.patch
+++ b/patches/6.1/0011-surface-gpe.patch
@ -1,4 +1,4 @@
-From cbc7e724af0ea95264e25ced0e9fb34e9018e137 Mon Sep 17 00:00:00 2001
+From 47c5c233ac5228afb49fc6be6f1f313bc717f5cb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 12 Mar 2023 01:41:57 +0100
 Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 9
@ -12,7 +12,7 @@ Patchset: surface-gpe
 1 file changed, 17 insertions(+)

 diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c
-index c219b840d491a..69c4352e8406b 100644
+index c219b840d491..69c4352e8406 100644
 --- a/drivers/platform/surface/surface_gpe.c
 +++ b/drivers/platform/surface/surface_gpe.c
@@ -41,6 +41,11 @@ static const struct property_entry lid_device_props_l4F[] = {
--- a/patches/6.1/0012-cameras.patch
+++ b/patches/6.1/0012-cameras.patch
@ -1,4 +1,4 @@
-From 5fc7f91df9a29db9c5cd4017a46410009b06b58b Mon Sep 17 00:00:00 2001
+From 88cf252dde1ff3aa4d1c7e6431fa80a409ecaeaf 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
@ -58,7 +58,7 @@ Patchset: cameras
 1 file changed, 3 insertions(+)

 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index dbfa58e799e28..ccbd3f8b523e8 100644
+index dbfa58e799e2..ccbd3f8b523e 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
@@ -2106,6 +2106,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
@ -74,7 +74,7 @@ index dbfa58e799e28..ccbd3f8b523e8 100644
 -- 
 2.40.1

-From e48327c218eb15a821b8bb7e46631d2ec0e5dec1 Mon Sep 17 00:00:00 2001
+From fd72e98abb6f8d39801212014074b5f6721e9ff4 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
@ -100,7 +100,7 @@ Patchset: cameras
 1 file changed, 30 insertions(+)

 diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index 3965979c7bd41..509cfb9f66954 100644
+index 3965979c7bd4..509cfb9f6695 100644
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
@@ -37,6 +37,12 @@
@ -191,7 +191,7 @@ index 3965979c7bd41..509cfb9f66954 100644
 -- 
 2.40.1

-From 2d6705c368e5bb3de448756e1a35797634fbb480 Mon Sep 17 00:00:00 2001
+From aee80ed3078dc3a8c3a4dde93efae305738be2c5 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
@ -208,7 +208,7 @@ Patchset: cameras
 1 file changed, 7 insertions(+)

 diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
-index 5b8d1a9620a5d..6a0ff035cf209 100644
+index 5b8d1a9620a5..6a0ff035cf20 100644
 --- a/drivers/platform/x86/intel/int3472/tps68470.c
 +++ b/drivers/platform/x86/intel/int3472/tps68470.c
@@ -46,6 +46,13 @@ static int tps68470_chip_init(struct device *dev, struct regmap *regmap)
@ -228,7 +228,7 @@ index 5b8d1a9620a5d..6a0ff035cf209 100644
 -- 
 2.40.1

-From 461ecc0b352a783b28b378d5829d551899f9492d Mon Sep 17 00:00:00 2001
+From f7b8dde42f8744ccc41a34e081f30e0021a23940 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
@ -247,7 +247,7 @@ Patchset: cameras
 create mode 100644 drivers/media/i2c/dw9719.c

 diff --git a/MAINTAINERS b/MAINTAINERS
-index 301b9ba6af79f..439133f39c009 100644
+index 301b9ba6af79..439133f39c00 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
@@ -6286,6 +6286,13 @@ T:	git git://linuxtv.org/media_tree.git
@ -265,7 +265,7 @@ index 301b9ba6af79f..439133f39c009 100644
 M:	Dongchun Zhu <dongchun.zhu@mediatek.com>
 L:	linux-media@vger.kernel.org
 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index 7806d4b81716e..98d081efeef7f 100644
+index 7806d4b81716..98d081efeef7 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
@@ -821,6 +821,17 @@ config VIDEO_DW9714
@ -287,7 +287,7 @@ index 7806d4b81716e..98d081efeef7f 100644
 	tristate "DW9768 lens voice coil support"
 	depends on I2C && VIDEO_DEV
 diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index 0a2933103dd92..b82a07c763880 100644
+index 0a2933103dd9..b82a07c76388 100644
 --- a/drivers/media/i2c/Makefile
 +++ b/drivers/media/i2c/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_VIDEO_CS5345) += cs5345.o
@ -300,7 +300,7 @@ index 0a2933103dd92..b82a07c763880 100644
 obj-$(CONFIG_VIDEO_ET8EK8) += et8ek8/
 diff --git a/drivers/media/i2c/dw9719.c b/drivers/media/i2c/dw9719.c
 new file mode 100644
-index 0000000000000..180b04d2a6b3a
+index 000000000000..180b04d2a6b3
 --- /dev/null
 +++ b/drivers/media/i2c/dw9719.c
@@ -0,0 +1,425 @@
@ -732,7 +732,7 @@ index 0000000000000..180b04d2a6b3a
 -- 
 2.40.1

-From a0c3e35a5b92df538eb056f72dbd595f957a1f77 Mon Sep 17 00:00:00 2001
+From 27e4c2c11065d83e973981d5dc16e139826925ce 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
@ -751,7 +751,7 @@ Patchset: cameras
 1 file changed, 23 insertions(+), 42 deletions(-)

 diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
-index 3b76a9d0383a8..38f9f4da1922e 100644
+index 3b76a9d0383a..38f9f4da1922 100644
 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
 +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
@@ -1383,7 +1383,10 @@ static int cio2_notifier_bound(struct v4l2_async_notifier *notifier,
@ -847,7 +847,7 @@ index 3b76a9d0383a8..38f9f4da1922e 100644
 -- 
 2.40.1

-From 404c6a119d756d03e38b99258c70125dcc8c24c6 Mon Sep 17 00:00:00 2001
+From 9937198809897a459c727b54449125c876899477 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
@ -865,7 +865,7 @@ Patchset: cameras
 1 file changed, 9 insertions(+)

 diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
-index 38f9f4da1922e..82681df7d794f 100644
+index 38f9f4da1922..82681df7d794 100644
 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
 +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
@@ -1430,9 +1430,18 @@ static void cio2_notifier_unbind(struct v4l2_async_notifier *notifier,
@ -890,7 +890,7 @@ index 38f9f4da1922e..82681df7d794f 100644
 -- 
 2.40.1

-From b9c804a928d483fa85133bdd4de9699cfe34e943 Mon Sep 17 00:00:00 2001
+From 704bd3669f6781a08f1eb6983cddc706fb2c0dad Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 15 Jul 2022 23:48:00 +0200
 Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies
@ -904,7 +904,7 @@ Patchset: cameras
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index 98d081efeef7f..c67966cafe109 100644
+index 98d081efeef7..c67966cafe10 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
@@ -823,7 +823,7 @@ config VIDEO_DW9714
@ -919,7 +919,7 @@ index 98d081efeef7f..c67966cafe109 100644
 -- 
 2.40.1

-From ae7dbdb16601a113dc464403fd0c8f6f09d8744f Mon Sep 17 00:00:00 2001
+From 26d626cfcd1f86c560802da12c146b1dcefd9138 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <dan.scally@ideasonboard.com>
 Date: Thu, 2 Mar 2023 12:59:39 +0000
 Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E
@ -941,7 +941,7 @@ Patchset: cameras
 1 file changed, 14 insertions(+)

 diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
-index c42c3faa2c32d..6f4b8e24eb56c 100644
+index c42c3faa2c32..6f4b8e24eb56 100644
 --- a/drivers/platform/x86/intel/int3472/discrete.c
 +++ b/drivers/platform/x86/intel/int3472/discrete.c
@@ -108,6 +108,9 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
--- a/patches/6.1/0013-amd-gpio.patch
+++ b/patches/6.1/0013-amd-gpio.patch
@ -1,4 +1,4 @@
-From dca6f27cebccc2d835614e6f79530bf9fdd30815 Mon Sep 17 00:00:00 2001
+From 442501128c7925f2e0c2dd5d1c220054f5a1a8b0 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
@ -21,7 +21,7 @@ Patchset: amd-gpio
 1 file changed, 17 insertions(+)

 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
-index 0f762070a5e10..6362dd4522337 100644
+index 0f762070a5e1..6362dd452233 100644
 --- a/arch/x86/kernel/acpi/boot.c
 +++ b/arch/x86/kernel/acpi/boot.c
@@ -22,6 +22,7 @@
@ -65,7 +65,7 @@ index 0f762070a5e10..6362dd4522337 100644
 -- 
 2.40.1

-From 5c381533e2a16a79170cc30c751701033b687c50 Mon Sep 17 00:00:00 2001
+From 417c239f3b143ef0db20714eb64f72ff4f19a00e 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
@ -80,7 +80,7 @@ Patchset: amd-gpio
 1 file changed, 8 insertions(+), 1 deletion(-)

 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
-index 6362dd4522337..8a092c2c6fa86 100644
+index 6362dd452233..8a092c2c6fa8 100644
 --- a/arch/x86/kernel/acpi/boot.c
 +++ b/arch/x86/kernel/acpi/boot.c
@@ -1255,12 +1255,19 @@ static void __init mp_config_acpi_legacy_irqs(void)
--- a/patches/6.1/0014-rtc.patch
+++ b/patches/6.1/0014-rtc.patch
@ -1,4 +1,4 @@
-From 69805d2382626cc92b73514fb945298284e65964 Mon Sep 17 00:00:00 2001
+From f901956ff489fe15559f68ce6cf1c54ba4aaa415 Mon Sep 17 00:00:00 2001
 From: "Bart Groeneveld | GPX Solutions B.V" <bart@gpxbv.nl>
 Date: Mon, 5 Dec 2022 16:08:46 +0100
 Subject: [PATCH] acpi: allow usage of acpi_tad on HW-reduced platforms
@ -21,7 +21,7 @@ Patchset: rtc
 1 file changed, 24 insertions(+), 11 deletions(-)

 diff --git a/drivers/acpi/acpi_tad.c b/drivers/acpi/acpi_tad.c
-index e9b8e8305e23e..944276934e7ec 100644
+index e9b8e8305e23..944276934e7e 100644
 --- a/drivers/acpi/acpi_tad.c
 +++ b/drivers/acpi/acpi_tad.c
@@ -432,6 +432,14 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr,