浏览代码

Update v6.1 patches

Changes:
 - Rebase onto v6.1.8

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/36ee5552bf06842cb5e77e8739c93017893af7dc
Maximilian Luz 2 年之前
父节点
当前提交
7847f422b4

+ 2 - 2
patches/6.1/0001-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 19b8ce192055bdeca49b476a88bd5d694c54bbf7 Mon Sep 17 00:00:00 2001
+From e209bd87d08869950b9fbccb1b1a52ae46cca2ee 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
@@ -97,5 +97,5 @@ index 6beb00858c33..d82d77387a0a 100644
  };
  
 -- 
-2.39.0
+2.39.1
 

+ 6 - 6
patches/6.1/0002-mwifiex.patch

@@ -1,4 +1,4 @@
-From ab8029b679353ff413840f06959039119731599a Mon Sep 17 00:00:00 2001
+From 807126f1fee9adc792b657e503e2377c9474368f 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
@@ -163,9 +163,9 @@ index d6ff964aec5b..5d30ae39d65e 100644
  void mwifiex_initialize_quirks(struct pcie_service_card *card);
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.39.0
+2.39.1
 
-From 38ad493a42fa7e93cee10d17640a39eea0ecba97 Mon Sep 17 00:00:00 2001
+From f004292d23fe1371e1ce2c3e7782cc661164195c 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+
@@ -318,9 +318,9 @@ index 5d30ae39d65e..c14eb56eb911 100644
  void mwifiex_initialize_quirks(struct pcie_service_card *card);
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.39.0
+2.39.1
 
-From 73bd3c344cd15dad5095585d51d0f07a7ae0eaf5 Mon Sep 17 00:00:00 2001
+From 86af49b1d4ec2d7faae0a6f8798d11aa90215481 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
@@ -396,5 +396,5 @@ index 6beafd62d722..633f77fb4f96 100644
  	    (id->driver_info & BTUSB_MEDIATEK)) {
  		hdev->setup = btusb_mtk_setup;
 -- 
-2.39.0
+2.39.1
 

+ 2 - 2
patches/6.1/0003-ath10k.patch

@@ -1,4 +1,4 @@
-From 8516237f9b2afa49f7b8f1d9e5ffc5be4a83c512 Mon Sep 17 00:00:00 2001
+From f22fbfa5abbca831ccbf4217adda1b8d50ee3954 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
@@ -117,5 +117,5 @@ index 5eb131ab916f..67f074a126d1 100644
  	ret = firmware_request_nowarn(&fw, filename, ar->dev);
  	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
 -- 
-2.39.0
+2.39.1
 

+ 8 - 8
patches/6.1/0004-ipts.patch

@@ -1,4 +1,4 @@
-From 42fabf8dcff992959f7e261a13779ba9eb757780 Mon Sep 17 00:00:00 2001
+From 2c2d01dbe82ccd154da707a53f5dab45b37300aa 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 99966cd3e7d8..67c602919b7e 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 99966cd3e7d8..67c602919b7e 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 704cd0caa172..b4dc3fddd20d 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[] = {
@@ -34,9 +34,9 @@ index 704cd0caa172..b4dc3fddd20d 100644
  
  	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
 -- 
-2.39.0
+2.39.1
 
-From 72fed1d44ac9a6ba0669e20fd617b6330af1634e Mon Sep 17 00:00:00 2001
+From 0d59af85033cbff1496b6a4de1a5dce755c0b30f 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
@@ -1499,9 +1499,9 @@ index 000000000000..53fb86a88f97
 +
 +#endif /* _IPTS_UAPI_H_ */
 -- 
-2.39.0
+2.39.1
 
-From e3eebbc271fccaa8579b04b340f4b4b01d54ec61 Mon Sep 17 00:00:00 2001
+From 93797032614d485639d977647d64ff6a2448280a 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
@@ -1599,5 +1599,5 @@ index 644ca49e8cf8..408c321b929a 100644
  {
  	if (risky_device(dev))
 -- 
-2.39.0
+2.39.1
 

+ 18 - 91
patches/6.1/0005-surface-sam.patch

@@ -1,4 +1,4 @@
-From 9e44cdad03a46c1f08f3be86173c118c6db561c6 Mon Sep 17 00:00:00 2001
+From 49d4e0f3885582fbc2a49dd6cb858ccd2d16a1bc Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:23:53 +0100
 Subject: [PATCH] platform/surface: aggregator: Improve documentation and
@@ -111,7 +111,7 @@ index bf007d6c9873..18fd0f0aee84 100644
  
  Limitations and Observations
 diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c
-index 43e765199137..54bfb1f3d2dc 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,
@@ -123,7 +123,7 @@ index 43e765199137..54bfb1f3d2dc 100644
  	item->event.command_id = cmd->cid;
  	item->event.instance_id = cmd->iid;
  	memcpy(&item->event.data[0], data->ptr, data->len);
-@@ -1777,35 +1777,35 @@ EXPORT_SYMBOL_GPL(ssam_request_sync_with_buffer);
+@@ -1779,35 +1779,35 @@ EXPORT_SYMBOL_GPL(ssam_request_sync_with_buffer);
  
  SSAM_DEFINE_SYNC_REQUEST_R(ssam_ssh_get_firmware_version, __le32, {
  	.target_category = SSAM_SSH_TC_SAM,
@@ -259,82 +259,9 @@ index 45501b6e54e8..5c4ae1a26183 100644
   * Known SSH/EC target categories.
   *
 -- 
-2.39.0
+2.39.1
 
-From 29ac02c869e3070532fa9f6a947dbde5125afe2d Mon Sep 17 00:00:00 2001
-From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Sat, 5 Nov 2022 21:30:58 +0100
-Subject: [PATCH] platform/surface: aggregator: Ignore command messages not
- intended for us
-
-It is possible that we (the host/kernel driver) receive command messages
-that are not intended for us. Ignore those for now.
-
-The whole story is a bit more complicated: It is possible to enable
-debug output on SAM, which is sent via SSH command messages. By default
-this output is sent to a debug connector, with its own target ID
-(TID=0x03). It is possible to override the target of the debug output
-and set it to the host/kernel driver. This, however, does not change the
-original target ID of the message. Meaning, we receive messages with
-TID=0x03 (debug) but expect to only receive messages with TID=0x00
-(host).
-
-The problem is that the different target ID also comes with a different
-scope of request IDs. In particular, these do not follow the standard
-event rules (i.e. do not fall into a set of small reserved values).
-Therefore, current message handling interprets them as responses to
-pending requests and tries to match them up via the request ID. However,
-these debug output messages are not in fact responses, and therefore
-this will at best fail to find the request and at worst pass on the
-wrong data as response for a request.
-
-Therefore ignore any command messages not intended for us (host) for
-now. We can implement support for the debug messages once we have a
-better understanding of them.
-
-Note that this may also provide a bit more stability and avoid some
-driver confusion in case any other targets want to talk to us in the
-future, since we don't yet know what to do with those as well. A warning
-for the dropped messages should suffice for now and also give us a
-chance of discovering new targets if they come along without any
-potential for bugs/instabilities.
-
-Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
-Patchset: surface-sam
----
- .../surface/aggregator/ssh_request_layer.c        | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/drivers/platform/surface/aggregator/ssh_request_layer.c b/drivers/platform/surface/aggregator/ssh_request_layer.c
-index f5565570f16c..90634dcacabf 100644
---- a/drivers/platform/surface/aggregator/ssh_request_layer.c
-+++ b/drivers/platform/surface/aggregator/ssh_request_layer.c
-@@ -916,6 +916,21 @@ static void ssh_rtl_rx_command(struct ssh_ptl *p, const struct ssam_span *data)
- 	if (sshp_parse_command(dev, data, &command, &command_data))
- 		return;
- 
-+	/*
-+	 * Check if the message was intended for us. If not, drop it.
-+	 *
-+	 * Note: We will need to change this to handle debug messages. On newer
-+	 * generation devices, these seem to be sent to SSAM_SSH_TID_DEBUG. We
-+	 * as host can still receive them as they can be forwarded via an
-+	 * override option on SAM, but doing so does not change the target ID
-+	 * to SSAM_SSH_TID_HOST.
-+	 */
-+	if (command->tid != SSAM_SSH_TID_HOST) {
-+		rtl_warn(rtl, "rtl: dropping message not intended for us (tid = %#04x)\n",
-+			 command->tid);
-+		return;
-+	}
-+
- 	if (ssh_rqid_is_event(get_unaligned_le16(&command->rqid)))
- 		ssh_rtl_rx_event(rtl, command, &command_data);
- 	else
--- 
-2.39.0
-
-From 7b80425cbcee6aeac0cf312367c1f98df72f2093 Mon Sep 17 00:00:00 2001
+From 7bbedf41c6dc00352b90d84bddc951b2ff429b27 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:42:19 +0100
 Subject: [PATCH] platform/surface: aggregator: Add target and source IDs to
@@ -526,9 +453,9 @@ index 2a2c17771d01..55cc61bba1da 100644
  		ssam_show_generic_u8_field(__entry->cid),
  		ssam_show_generic_u8_field(__entry->iid),
 -- 
-2.39.0
+2.39.1
 
-From 28f119067bd5982c043f3822b01a864e60d6ec54 Mon Sep 17 00:00:00 2001
+From bdeb5fd1669c2f2235aae296a2ec15d73cd6d160 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:32:16 +0100
 Subject: [PATCH] platform/surface: aggregator_hub: Use target-ID enum instead
@@ -566,9 +493,9 @@ index 43061514be38..62f27cdb6ca8 100644
  	.instance_id     = 0x00,
  });
 -- 
-2.39.0
+2.39.1
 
-From e9cc6b4179e0e913d5203273742b0ad40f9da048 Mon Sep 17 00:00:00 2001
+From 9b8a09ae48a87958a28d941bc5a3424d93e5ac88 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:33:26 +0100
 Subject: [PATCH] platform/surface: aggregator_tabletsw: Use target-ID enum
@@ -615,9 +542,9 @@ index 27d95a6a7851..bd8cd453c393 100644
  	.instance_id     = 0x00,
  });
 -- 
-2.39.0
+2.39.1
 
-From 118efac5894275e2910b1e6a7764da49ef78a017 Mon Sep 17 00:00:00 2001
+From 9b0a4cdd3f96e6004dc34bba3c6ffbdc6bcb746d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:34:06 +0100
 Subject: [PATCH] platform/surface: dtx: Use target-ID enum instead of
@@ -710,9 +637,9 @@ index ed36944467f9..0de76a784a35 100644
  	.instance_id     = 0x00,
  });
 -- 
-2.39.0
+2.39.1
 
-From 1bf091f4db2f290dc82252ae0479f92e37dc87b0 Mon Sep 17 00:00:00 2001
+From 9cc6a8de04a496870726ff69726c004a198530b2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:40:06 +0100
 Subject: [PATCH] HID: surface-hid: Use target-ID enum instead of hard-coding
@@ -741,9 +668,9 @@ index 0635341bc517..42933bf3e925 100644
  	shid->uid.function = 0;
  
 -- 
-2.39.0
+2.39.1
 
-From 9530d700f41edbddd880d2bec9e3b6547de811f3 Mon Sep 17 00:00:00 2001
+From 54e9685da6a18f97a58838547ad07e3baaa01ebf Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:45:28 +0100
 Subject: [PATCH] platform/surface: aggregator: Enforce use of target-ID enum
@@ -973,9 +900,9 @@ index 46c45d1b6368..4da20b7a0ee5 100644
  /*
   * enum ssam_device_flags - Flags for SSAM client devices.
 -- 
-2.39.0
+2.39.1
 
-From f905337cf4c31e3cc429b94ab9586b370b882c23 Mon Sep 17 00:00:00 2001
+From 795b4ddb4d3dad38b5123e354b25b327632e0ce5 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 5 Nov 2022 21:46:37 +0100
 Subject: [PATCH] platform/surface: aggregator_registry: Fix target-ID of
@@ -1020,5 +947,5 @@ index 023f126121d7..296f72d52e6a 100644
  };
  
 -- 
-2.39.0
+2.39.1
 

+ 4 - 4
patches/6.1/0006-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From e17056688f8040ace8f60ee7a5ebc4e196ae6b0d Mon Sep 17 00:00:00 2001
+From 979716988ad9089d7c514f2bd46af44bba8e4c15 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
@@ -108,9 +108,9 @@ index 4dd777cc0c89..b2338618163a 100644
  		dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
  			 accessor_type, client->addr);
 -- 
-2.39.0
+2.39.1
 
-From 725ce85d616e7b985208e32426c41a95a33c4005 Mon Sep 17 00:00:00 2001
+From 509a5fbfc31b5493b852b1733cf4e10f1d868e34 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
@@ -331,5 +331,5 @@ index 000000000000..8b816ed8f35c
 +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
 +MODULE_LICENSE("GPL");
 -- 
-2.39.0
+2.39.1
 

+ 4 - 4
patches/6.1/0007-surface-button.patch

@@ -1,4 +1,4 @@
-From 0f45b177ca4e7d9b62c0f7572e273104fe93f274 Mon Sep 17 00:00:00 2001
+From c624d3beb3b35ff81f7039743e0327adf244c6a3 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
@@ -73,9 +73,9 @@ index 09489380afda..0f02411a60f1 100644
  
  /*
 -- 
-2.39.0
+2.39.1
 
-From bff73a6735c9eba68a048fa321c371714d5817f6 Mon Sep 17 00:00:00 2001
+From 1e0b7fe3e1b09f1c8833c8e3b2243577e5bd66d2 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
@@ -145,5 +145,5 @@ index 242fb690dcaf..30eea54dbb47 100644
  
  
 -- 
-2.39.0
+2.39.1
 

+ 4 - 4
patches/6.1/0008-surface-typecover.patch

@@ -1,4 +1,4 @@
-From dc3a1664b024f9f8051f65ee84edf5391460dbc4 Mon Sep 17 00:00:00 2001
+From 8ee33077bf928467ebec5b139729e1091e2a1579 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
@@ -229,9 +229,9 @@ index 372cbdd223e0..fe849df6a948 100644
  	{ .driver_data = MT_CLS_GOOGLE,
  		HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
 -- 
-2.39.0
+2.39.1
 
-From 88620b36eb8e96c20001aaeda03ad290cbabf43e Mon Sep 17 00:00:00 2001
+From 752f2f89096ba2555c3123d388f076ab8054110e 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
@@ -529,5 +529,5 @@ index fe849df6a948..3a7a43eb9fbe 100644
  	unregister_pm_notifier(&td->pm_notifier);
  	del_timer_sync(&td->release_timer);
 -- 
-2.39.0
+2.39.1
 

+ 17 - 17
patches/6.1/0009-cameras.patch

@@ -1,4 +1,4 @@
-From d7034b752abab1bc8bbeae6bec214434a59e9a43 Mon Sep 17 00:00:00 2001
+From 3b3d5bc599a2d574cbbea9bd9441242d94334127 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,10 +58,10 @@ Patchset: cameras
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index b47e93a24a9a..22c921886cbe 100644
+index dbfa58e799e2..ccbd3f8b523e 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
-@@ -2103,6 +2103,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
+@@ -2106,6 +2106,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
  
  static void acpi_default_enumeration(struct acpi_device *device)
  {
@@ -72,9 +72,9 @@ index b47e93a24a9a..22c921886cbe 100644
  	 * Do not enumerate devices with enumeration_by_parent flag set as
  	 * they will be enumerated by their respective parents.
 -- 
-2.39.0
+2.39.1
 
-From b7ae48c658abca801fb92cc6c734a3e3726ede8a Mon Sep 17 00:00:00 2001
+From 75a1c8fad69de12e2d6fe05401ea02413c02bb15 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
@@ -189,9 +189,9 @@ index 408c321b929a..6e58effbe12b 100644
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
  
 -- 
-2.39.0
+2.39.1
 
-From b8246f77d572fe16b5cd53acf2473cb6eddcaddc Mon Sep 17 00:00:00 2001
+From 87759669409640b92e2d66b1c6644d205d80d9ca 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
@@ -226,9 +226,9 @@ index 5b8d1a9620a5..6a0ff035cf20 100644
  
  	return 0;
 -- 
-2.39.0
+2.39.1
 
-From 75d54e3be5ceb01b46d74e3e9d3af3f88d7a2669 Mon Sep 17 00:00:00 2001
+From 2af8c34fdf6b8686341b269082ac53c65869fcf5 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 886d3f69ee64..659fc8af4a12 100644
+index d4822ae39e39..41e9ec6c55d5 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -6286,6 +6286,13 @@ T:	git git://linuxtv.org/media_tree.git
@@ -730,9 +730,9 @@ index 000000000000..180b04d2a6b3
 +MODULE_DESCRIPTION("DW9719 VCM Driver");
 +MODULE_LICENSE("GPL");
 -- 
-2.39.0
+2.39.1
 
-From 0611d5aa6bb68362b37dc6dc310050ed2d16bd64 Mon Sep 17 00:00:00 2001
+From c809a70d80cd54972431868f3a4f24332574ea92 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
@@ -845,9 +845,9 @@ index 390bd5ea3472..76339fb842bf 100644
  
  static int cio2_parse_firmware(struct cio2_device *cio2)
 -- 
-2.39.0
+2.39.1
 
-From 65a24c651f437949aaa6cd640bf8318d747a92ce Mon Sep 17 00:00:00 2001
+From 4850a7dba77284e47ef1d3cdb0da237ff61c86d2 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
@@ -888,9 +888,9 @@ index 76339fb842bf..eb7aa269ec2b 100644
  
  static int cio2_parse_firmware(struct cio2_device *cio2)
 -- 
-2.39.0
+2.39.1
 
-From c07d00b78e9792663f36a8f57444fc9b4e66a0d8 Mon Sep 17 00:00:00 2001
+From 6dcadafc4dda4a5cd0549170fd066485711cc778 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
@@ -917,5 +917,5 @@ index 98d081efeef7..c67966cafe10 100644
  	select VIDEO_V4L2_SUBDEV_API
  	select V4L2_ASYNC
 -- 
-2.39.0
+2.39.1
 

+ 4 - 4
patches/6.1/0010-amd-gpio.patch

@@ -1,4 +1,4 @@
-From 4e0cf6e05dd0de32045adcc2087f4ed7c9a184e7 Mon Sep 17 00:00:00 2001
+From b33468d1241a2c99ebf0e85f18504dcea8922054 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
@@ -63,9 +63,9 @@ index 907cc98b1938..0116d27b29ea 100644
  	mp_config_acpi_legacy_irqs();
  
 -- 
-2.39.0
+2.39.1
 
-From 94f476cef8457ab5cba6109ee104608eba7e8072 Mon Sep 17 00:00:00 2001
+From b61c1aae91104e9a1a4eb0da6cc2830e612979e8 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
@@ -105,5 +105,5 @@ index 0116d27b29ea..af102c6f8e5b 100644
  };
  
 -- 
-2.39.0
+2.39.1
 

+ 2 - 2
patches/6.1/0011-rtc.patch

@@ -1,4 +1,4 @@
-From ad11ec823a7792d636492a9f99dfaf7bd7842f0d Mon Sep 17 00:00:00 2001
+From a3547b23b77a3069fd6eb4cc7444f48a71eb3405 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
@@ -105,5 +105,5 @@ index e9b8e8305e23..944276934e7e 100644
  		ret = sysfs_create_group(&dev->kobj, &acpi_tad_dc_attr_group);
  		if (ret)
 -- 
-2.39.0
+2.39.1