Update v5.10 patches

Changes:
 - Update patches to v5.10.24

 - SAM:
   - Small code cleanup

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/6983edb6c3db615aee321219d245f39302e8fbe0
 - SAM: https://github.com/linux-surface/surface-aggregator-module/commit/53fbf8d1f862d719612525e0c342b74173fbcb8c

patches/5.10/0001-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 08f96d77d331139d67c7b5f8ff292a3b2ccbe54e Mon Sep 17 00:00:00 2001
+From b76df1eb928d9f3cc6ad7594accc3ed55c570d1f 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 2752dc955733..ef36a316e2ed 100644
  };
  
 -- 
-2.30.1
+2.30.2
 

patches/5.10/0002-wifi.patch

@@ -1,162 +1,4 @@
-From 991c024a6ff5d7587f619f2fac62f3c11d3625d5 Mon Sep 17 00:00:00 2001
-From: Tsuchiya Yuto <kitakar@gmail.com>
-Date: Thu, 24 Sep 2020 18:02:06 +0900
-Subject: [PATCH] mwifiex: pcie: skip cancel_work_sync() on reset failure path
-
-If a reset is performed, but even the reset fails for some reasons (e.g.,
-on Surface devices, the fw reset requires another quirks),
-cancel_work_sync() hangs in mwifiex_cleanup_pcie().
-
-    # reset performed after firmware went into bad state
-    kernel: mwifiex_pcie 0000:01:00.0: WLAN FW already running! Skip FW dnld
-    kernel: mwifiex_pcie 0000:01:00.0: WLAN FW is active
-    # but even the reset failed
-    kernel: mwifiex_pcie 0000:01:00.0: mwifiex_cmd_timeout_func: Timeout cmd id = 0xfa, act = 0xa000
-    kernel: mwifiex_pcie 0000:01:00.0: num_data_h2c_failure = 0
-    kernel: mwifiex_pcie 0000:01:00.0: num_cmd_h2c_failure = 0
-    kernel: mwifiex_pcie 0000:01:00.0: is_cmd_timedout = 1
-    kernel: mwifiex_pcie 0000:01:00.0: num_tx_timeout = 0
-    kernel: mwifiex_pcie 0000:01:00.0: last_cmd_index = 2
-    kernel: mwifiex_pcie 0000:01:00.0: last_cmd_id: 16 00 a4 00 fa 00 a4 00 7f 00
-    kernel: mwifiex_pcie 0000:01:00.0: last_cmd_act: 00 00 00 00 00 a0 00 00 00 00
-    kernel: mwifiex_pcie 0000:01:00.0: last_cmd_resp_index = 0
-    kernel: mwifiex_pcie 0000:01:00.0: last_cmd_resp_id: 16 80 7f 80 16 80 a4 80 7f 80
-    kernel: mwifiex_pcie 0000:01:00.0: last_event_index = 1
-    kernel: mwifiex_pcie 0000:01:00.0: last_event: 58 00 58 00 58 00 58 00 58 00
-    kernel: mwifiex_pcie 0000:01:00.0: data_sent=0 cmd_sent=1
-    kernel: mwifiex_pcie 0000:01:00.0: ps_mode=0 ps_state=0
-    kernel: mwifiex_pcie 0000:01:00.0: info: _mwifiex_fw_dpc: unregister device
-    # mwifiex_pcie_work hanged
-    kernel: INFO: task kworker/0:0:24857 blocked for more than 122 seconds.
-    kernel:       Tainted: G        W  OE     5.3.11-arch1-1 #1
-    kernel: "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
-    kernel: kworker/0:0     D    0 24857      2 0x80004000
-    kernel: Workqueue: events mwifiex_pcie_work [mwifiex_pcie]
-    kernel: Call Trace:
-    kernel:  ? __schedule+0x27f/0x6d0
-    kernel:  schedule+0x43/0xd0
-    kernel:  schedule_timeout+0x299/0x3d0
-    kernel:  ? __switch_to_asm+0x40/0x70
-    kernel:  wait_for_common+0xeb/0x190
-    kernel:  ? wake_up_q+0x60/0x60
-    kernel:  __flush_work+0x130/0x1e0
-    kernel:  ? flush_workqueue_prep_pwqs+0x130/0x130
-    kernel:  __cancel_work_timer+0x123/0x1b0
-    kernel:  mwifiex_cleanup_pcie+0x28/0xd0 [mwifiex_pcie]
-    kernel:  mwifiex_free_adapter+0x24/0xe0 [mwifiex]
-    kernel:  _mwifiex_fw_dpc+0x28d/0x520 [mwifiex]
-    kernel:  mwifiex_reinit_sw+0x15d/0x2c0 [mwifiex]
-    kernel:  mwifiex_pcie_reset_done+0x50/0x80 [mwifiex_pcie]
-    kernel:  pci_try_reset_function+0x38/0x70
-    kernel:  process_one_work+0x1d1/0x3a0
-    kernel:  worker_thread+0x4a/0x3d0
-    kernel:  kthread+0xfb/0x130
-    kernel:  ? process_one_work+0x3a0/0x3a0
-    kernel:  ? kthread_park+0x80/0x80
-    kernel:  ret_from_fork+0x35/0x40
-
-This is a deadlock caused by calling cancel_work_sync() in
-mwifiex_cleanup_pcie():
-
-- Device resets are done via mwifiex_pcie_card_reset()
-- which schedules card->work to call mwifiex_pcie_card_reset_work()
-- which calls pci_try_reset_function().
-- This leads to mwifiex_pcie_reset_done() be called on the same workqueue,
-  which in turn calls
-- mwifiex_reinit_sw() and that calls
-- _mwifiex_fw_dpc().
-
-The problem is now that _mwifiex_fw_dpc() calls mwifiex_free_adapter()
-in case firmware initialization fails. That ends up calling
-mwifiex_cleanup_pcie().
-
-Note that all those calls are still running on the workqueue. So when
-mwifiex_cleanup_pcie() now calls cancel_work_sync(), it's really waiting
-on itself to complete, causing a deadlock.
-
-This commit fixes the deadlock by skipping cancel_work_sync() on a reset
-failure path.
-
-After this commit, when reset fails, the following output is
-expected to be shown:
-
-    kernel: mwifiex_pcie 0000:03:00.0: info: _mwifiex_fw_dpc: unregister device
-    kernel: mwifiex: Failed to bring up adapter: -5
-    kernel: mwifiex_pcie 0000:03:00.0: reinit failed: -5
-
-To reproduce this issue, for example, try putting the root port of wifi
-into D3 (replace "00:1d.3" with your setup).
-
-    # put into D3 (root port)
-    sudo setpci -v -s 00:1d.3 CAP_PM+4.b=0b
-
-Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
-Patchset: wifi
----
- drivers/net/wireless/marvell/mwifiex/pcie.c | 18 +++++++++++++++++-
- drivers/net/wireless/marvell/mwifiex/pcie.h |  2 ++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
-index 6a10ff0377a2..33cf952cc01d 100644
---- a/drivers/net/wireless/marvell/mwifiex/pcie.c
-+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
-@@ -526,6 +526,8 @@ static void mwifiex_pcie_reset_prepare(struct pci_dev *pdev)
- 	clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags);
- 	clear_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags);
- 	mwifiex_dbg(adapter, INFO, "%s, successful\n", __func__);
-+
-+	card->pci_reset_ongoing = true;
- }
- 
- /*
-@@ -554,6 +556,8 @@ static void mwifiex_pcie_reset_done(struct pci_dev *pdev)
- 		dev_err(&pdev->dev, "reinit failed: %d\n", ret);
- 	else
- 		mwifiex_dbg(adapter, INFO, "%s, successful\n", __func__);
-+
-+	card->pci_reset_ongoing = false;
- }
- 
- static const struct pci_error_handlers mwifiex_pcie_err_handler = {
-@@ -3142,7 +3146,19 @@ static void mwifiex_cleanup_pcie(struct mwifiex_adapter *adapter)
- 	int ret;
- 	u32 fw_status;
- 
--	cancel_work_sync(&card->work);
-+	/* Perform the cancel_work_sync() only when we're not resetting
-+	 * the card. It's because that function never returns if we're
-+	 * in reset path. If we're here when resetting the card, it means
-+	 * that we failed to reset the card (reset failure path).
-+	 */
-+	if (!card->pci_reset_ongoing) {
-+		mwifiex_dbg(adapter, MSG, "performing cancel_work_sync()...\n");
-+		cancel_work_sync(&card->work);
-+		mwifiex_dbg(adapter, MSG, "cancel_work_sync() done\n");
-+	} else {
-+		mwifiex_dbg(adapter, MSG,
-+			    "skipped cancel_work_sync() because we're in card reset failure path\n");
-+	}
- 
- 	ret = mwifiex_read_reg(adapter, reg->fw_status, &fw_status);
- 	if (fw_status == FIRMWARE_READY_PCIE) {
-diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h
-index 843d57eda820..5ed613d65709 100644
---- a/drivers/net/wireless/marvell/mwifiex/pcie.h
-+++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
-@@ -242,6 +242,8 @@ struct pcie_service_card {
- 	struct mwifiex_msix_context share_irq_ctx;
- 	struct work_struct work;
- 	unsigned long work_flags;
-+
-+	bool pci_reset_ongoing;
- };
- 
- static inline int
--- 
-2.30.1
-
-From 28749ed558d68bcd6332217911aa8f96dfaf5da7 Mon Sep 17 00:00:00 2001
+From f335f79392d382b4907f519cc335ae530278f179 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Mon, 28 Sep 2020 17:46:49 +0900
 Subject: [PATCH] mwifiex: pcie: add DMI-based quirk impl for Surface devices
@@ -362,9 +204,9 @@ index 000000000000..5326ae7e5671
 +
 +void mwifiex_initialize_quirks(struct pcie_service_card *card);
 -- 
-2.30.1
+2.30.2
 
-From bbf7ac5f973613a842c8a6660f611397e121748d Mon Sep 17 00:00:00 2001
+From 57c807ccf56e0992624360d3c5bb8fe7817c7137 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Tue, 29 Sep 2020 17:25:22 +0900
 Subject: [PATCH] mwifiex: pcie: add reset_d3cold quirk for Surface gen4+
@@ -563,9 +405,9 @@ index 5326ae7e5671..8b9dcb5070d8 100644
  void mwifiex_initialize_quirks(struct pcie_service_card *card);
 +int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.30.1
+2.30.2
 
-From 1bd851eea10c8b8d9735132ddb6c73f0f604565c Mon Sep 17 00:00:00 2001
+From bbce85960313628ccc39252f9895c4feac475614 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
@@ -742,9 +584,9 @@ index 8b9dcb5070d8..3ef7440418e3 100644
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 +int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev);
 -- 
-2.30.1
+2.30.2
 
-From 65e0f315f36d071afd5794e17c1d5fdaa916c419 Mon Sep 17 00:00:00 2001
+From 888a0dca7c7b1d0b78dcd978d11d990ae02995c2 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
@@ -804,9 +646,9 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
  		.ident = "Surface Pro 3",
  		.matches = {
 -- 
-2.30.1
+2.30.2
 
-From 5cbbcbde496089e0c6f93db1792676b9460bfe54 Mon Sep 17 00:00:00 2001
+From 93d7b97892580090cc43bb4706ecbd45d5d3b9b3 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Thu, 24 Sep 2020 01:56:34 +0900
 Subject: [PATCH] mwifiex: pcie: use shutdown_sw()/reinit_sw() on
@@ -946,9 +788,9 @@ index 94561ddaf126..7b25335f1df3 100644
  	return 0;
  }
 -- 
-2.30.1
+2.30.2
 
-From 671abd130867929cc77428567bdeeffc9a7f5a98 Mon Sep 17 00:00:00 2001
+From 44338db5c7ecab4c2aa41fdcd63b1dd6a994885d Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Mon, 24 Aug 2020 17:11:35 +0900
 Subject: [PATCH] mwifiex: pcie: add enable_device_dump module parameter
@@ -995,9 +837,9 @@ index 7b25335f1df3..f7e0b86eb553 100644
  	if (!adapter->devdump_data) {
  		mwifiex_dbg(adapter, ERROR,
 -- 
-2.30.1
+2.30.2
 
-From f8b11cefb4af47fbe88760baca18bc4a21b72266 Mon Sep 17 00:00:00 2001
+From 83864f016a1e6af36cd27a3062780d4ada66b969 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+
@@ -1150,9 +992,9 @@ index 3ef7440418e3..a95ebac06e13 100644
  void mwifiex_initialize_quirks(struct pcie_service_card *card);
  int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
 -- 
-2.30.1
+2.30.2
 
-From 2fd452d9ccfa37dd8b555194973933bdaca27f79 Mon Sep 17 00:00:00 2001
+From a2b48d821f7e92f231954f862d3319bc1982b6ba Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:25:48 +0900
 Subject: [PATCH] mwifiex: add allow_ps_mode module parameter
@@ -1212,9 +1054,9 @@ index a6b9dc6700b1..943bc1e8ceae 100644
  }
  
 -- 
-2.30.1
+2.30.2
 
-From 8fea1122e006985576a1d1961a62a8066b5de9f5 Mon Sep 17 00:00:00 2001
+From 622533c3eab640f8f21e5681625ee3f112fd68cb Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:38:48 +0900
 Subject: [PATCH] mwifiex: print message when changing ps_mode
@@ -1247,9 +1089,9 @@ index 943bc1e8ceae..a2eb8df8d385 100644
  }
  
 -- 
-2.30.1
+2.30.2
 
-From ed0baff5e9154ff7fa185a8460941aad031cb9df Mon Sep 17 00:00:00 2001
+From c21851303336b80cfe4166a3c2b5a4a0b764b217 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:59:37 +0900
 Subject: [PATCH] mwifiex: disable ps_mode explicitly by default instead
@@ -1295,5 +1137,5 @@ index d3a968ef21ef..9b7b52fbc9c4 100644
  
  		if (drcs) {
 -- 
-2.30.1
+2.30.2
 

patches/5.10/0003-ipts.patch

@@ -1,4 +1,4 @@
-From 9aeb7af9e28a7db4bbb2e15a9b3f122673002263 Mon Sep 17 00:00:00 2001
+From 90e1d7db373353485b576401393603531e19e5b7 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
@@ -34,9 +34,9 @@ index a7e179626b63..fdcc0eedc49f 100644
  	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
  	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_H, MEI_ME_PCH15_SPS_CFG)},
 -- 
-2.30.1
+2.30.2
 
-From d07e2293d6df5798e6dc0a91fcd4b1bdb387bd13 Mon Sep 17 00:00:00 2001
+From 6e108530058a5bcdce66b4876e4d2df2857886a9 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Thu, 25 Feb 2021 09:37:47 +0100
 Subject: [PATCH] misc: mei: Remove client devices before shutting down bus
@@ -63,9 +63,9 @@ index bcee77768b91..21ed765003e1 100644
  	mei_cancel_work(dev);
  
 -- 
-2.30.1
+2.30.2
 
-From cde2085247984957e783a754a2d75f253516d891 Mon Sep 17 00:00:00 2001
+From 808625970ba4458fac3b968aca422dd7109dd3fb 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
@@ -1530,5 +1530,5 @@ index 000000000000..53fb86a88f97
 +
 +#endif /* _IPTS_UAPI_H_ */
 -- 
-2.30.1
+2.30.2
 

patches/5.10/0004-surface-gpe.patch

@@ -1,4 +1,4 @@
-From fcce57eca2cdcbd93aa3d55ec392839315149c8f Mon Sep 17 00:00:00 2001
+From 52a8c0bfb4c8aa190c8785896aca7b60e07433bb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 16 Aug 2020 23:39:56 +0200
 Subject: [PATCH] platform/x86: Add Driver to set up lid GPEs on MS Surface
@@ -397,5 +397,5 @@ index 000000000000..86f6991b1215
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurface*:*");
 -- 
-2.30.1
+2.30.2
 

patches/5.10/0005-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From dd75503cd08a7d3c694c535dc8468adce3d0afeb Mon Sep 17 00:00:00 2001
+From 66e611f6ae6b9242f57c88c986bd64d36b9c5c9c 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 37c510d9347a..aed579942436 100644
  		dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
  			 accessor_type, client->addr);
 -- 
-2.30.1
+2.30.2
 
-From 5e92c729b174515bc511c2742270712e20dc1bd0 Mon Sep 17 00:00:00 2001
+From f222c16f529991ea37c30eb8230eaffd697f5c35 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 6 Sep 2020 04:01:19 +0200
 Subject: [PATCH] platform/x86: Add driver for Surface Book 1 dGPU switch
@@ -331,5 +331,5 @@ index 000000000000..8c66ed5110fd
 +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
 +MODULE_LICENSE("GPL");
 -- 
-2.30.1
+2.30.2
 

patches/5.10/0006-surface-sam.patch

@@ -1,4 +1,4 @@
-From b1175454db03da261c46b0661cb8784565cabd87 Mon Sep 17 00:00:00 2001
+From 2e5706ef401f67d7c18ceeae4bdac24a85c1376a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 17 Aug 2020 01:23:20 +0200
 Subject: [PATCH] Add file2alias support for Surface Aggregator Module devices
@@ -97,9 +97,9 @@ index 2417dd1dee33..a6c583362b92 100644
  
  /* Create MODULE_ALIAS() statements.
 -- 
-2.30.1
+2.30.2
 
-From ea74cc928782d6a17ea7f44bc320672b252e357d Mon Sep 17 00:00:00 2001
+From 3814d8f09548e0c8095c3518070c84b16f7b0db5 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 17 Aug 2020 01:44:30 +0200
 Subject: [PATCH] platform/x86: Add support for Surface System Aggregator
@@ -14259,7 +14259,7 @@ index 000000000000..79e28fab7e40
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/platform/x86/surface_aggregator_registry.c b/drivers/platform/x86/surface_aggregator_registry.c
 new file mode 100644
-index 000000000000..c42b97f61a57
+index 000000000000..eccb9d1007cd
 --- /dev/null
 +++ b/drivers/platform/x86/surface_aggregator_registry.c
 @@ -0,0 +1,644 @@
@@ -14617,7 +14617,7 @@ index 000000000000..c42b97f61a57
 +	NULL,
 +};
 +
-+const struct attribute_group ssam_base_hub_group = {
++static const struct attribute_group ssam_base_hub_group = {
 +	.attrs = ssam_base_hub_attrs,
 +};
 +
@@ -19879,5 +19879,5 @@ index a6c583362b92..5b79fdc42641 100644
  	ADD(alias, "f", match_flags & SSAM_MATCH_FUNCTION, function);
  
 -- 
-2.30.1
+2.30.2
 

patches/5.10/0007-surface-hotplug.patch

@@ -1,4 +1,4 @@
-From f6bc7d13604522e5f79dec0129d086f75e7a8887 Mon Sep 17 00:00:00 2001
+From ccbba9c6e1e67b4123a96f7802a3a50a2154c241 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 9 Nov 2020 14:23:00 +0100
 Subject: [PATCH] PCI: Run platform power transition on initial D0 entry
@@ -43,7 +43,7 @@ Patchset: surface-hotplug
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
-index 5c9345072510..93e2c762ca5e 100644
+index 9e971fffeb6a..0c21be15cb69 100644
 --- a/drivers/pci/pci.c
 +++ b/drivers/pci/pci.c
 @@ -1804,7 +1804,7 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
@@ -56,9 +56,9 @@ index 5c9345072510..93e2c762ca5e 100644
  		return err;
  
 -- 
-2.30.1
+2.30.2
 
-From 090ae65748e015cc4d510c56e6bf4682f385c863 Mon Sep 17 00:00:00 2001
+From 2c852f14eac20e1741ae7838fab6eaaee29dd55f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 31 Oct 2020 20:46:33 +0100
 Subject: [PATCH] PCI: Add sysfs attribute for PCI device power state
@@ -129,9 +129,9 @@ index d15c881e2e7e..b15f754e6346 100644
  	&dev_attr_vendor.attr,
  	&dev_attr_device.attr,
 -- 
-2.30.1
+2.30.2
 
-From 98326ff4eb318a63a396387c9cab346e44526a4e Mon Sep 17 00:00:00 2001
+From 213fd6e0d382fa728b77a16c1476497c7c8b4524 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 14 Dec 2020 20:50:59 +0100
 Subject: [PATCH] platform/x86: Add Surface Hotplug driver
@@ -482,5 +482,5 @@ index 000000000000..cfcc15cfbacb
 +MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices");
 +MODULE_LICENSE("GPL");
 -- 
-2.30.1
+2.30.2
 

patches/5.10/0008-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 746a8d10782c945a565b97f54324a6a406f1b6bd Mon Sep 17 00:00:00 2001
+From 4e26d0895333c375ad3dfb6d9eb3609905b4fc93 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,5 +229,5 @@ index 8429ebe7097e..44d48e8bbe1a 100644
  	{ .driver_data = MT_CLS_GOOGLE,
  		HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
 -- 
-2.30.1
+2.30.2
 

patches/5.10/0009-surface-sensors.patch

@@ -1,4 +1,4 @@
-From 3924248d73a90811f97faf14945e01a413d63ccf Mon Sep 17 00:00:00 2001
+From a9458d96fba15ed4af4a00dfb75089a51387cfca Mon Sep 17 00:00:00 2001
 From: Max Leiter <maxwell.leiter@gmail.com>
 Date: Sat, 19 Dec 2020 17:50:55 -0800
 Subject: [PATCH] iio:light:apds9960 add detection for MSHW0184 ACPI device in
@@ -49,5 +49,5 @@ index 9afb3fcc74e6..20719141c03a 100644
  	.probe		= apds9960_probe,
  	.remove		= apds9960_remove,
 -- 
-2.30.1
+2.30.2
 

patches/5.10/0010-cameras.patch

@@ -1,4 +1,4 @@
-From 60ab56136db4c10ffd97c18f743df3c8abd98e4d Mon Sep 17 00:00:00 2001
+From c9ab907f54c777c8d39168a15beb387c35288858 Mon Sep 17 00:00:00 2001
 From: Sakari Ailus <sakari.ailus@linux.intel.com>
 Date: Mon, 12 Oct 2020 21:04:11 +0300
 Subject: [PATCH] ipu3-cio2: Use unsigned values where appropriate
@@ -314,9 +314,9 @@ index 146492383aa5..7650d7998a3f 100644
  
  struct cio2_csi2_timing {
 -- 
-2.30.1
+2.30.2
 
-From 36bd30ef316fab4bb42597c8e4a00aea72703044 Mon Sep 17 00:00:00 2001
+From d26f5290a85fd3f8dd62beaea4a016d8578c86c2 Mon Sep 17 00:00:00 2001
 From: Sakari Ailus <sakari.ailus@linux.intel.com>
 Date: Mon, 12 Oct 2020 21:04:12 +0300
 Subject: [PATCH] ipu3-cio2: Remove explicit type from frame size checks
@@ -348,9 +348,9 @@ index dcbfe8c9abc7..a1f574095acc 100644
  
  	mutex_lock(&q->subdev_lock);
 -- 
-2.30.1
+2.30.2
 
-From e82f25619a729c22dfa07b5e6e142e7aa1c5c21e Mon Sep 17 00:00:00 2001
+From ca5af8f2830540078fb4bf8e0b2002e1c7e1b295 Mon Sep 17 00:00:00 2001
 From: Sakari Ailus <sakari.ailus@linux.intel.com>
 Date: Mon, 12 Oct 2020 21:04:13 +0300
 Subject: [PATCH] ipu3-cio2: Rename CIO2_IMAGE_MAX_LENGTH as
@@ -407,9 +407,9 @@ index 7650d7998a3f..ccf0b85ae36f 100644
  /* 32MB = 8xFBPT_entry */
  #define CIO2_MAX_LOPS					8
 -- 
-2.30.1
+2.30.2
 
-From 60714de2a41806b12bda79018d3ad935b780811c Mon Sep 17 00:00:00 2001
+From 77ebf44861747cef59a8da5924915d57d08980d6 Mon Sep 17 00:00:00 2001
 From: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
 Date: Tue, 13 Oct 2020 17:25:35 +0300
 Subject: [PATCH] ipu3-cio2: Check receved the size against payload size, not
@@ -461,9 +461,9 @@ index 93fd25a5a3e9..b244b9de142a 100644
  		}
  		atomic_inc(&q->frame_sequence);
 -- 
-2.30.1
+2.30.2
 
-From 06a927eda11f9d41bf42b86c46b7e7ce019f0723 Mon Sep 17 00:00:00 2001
+From 9929395d64b9e4d896f9c6314cf16dcd7934afc5 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Wed, 30 Dec 2020 22:44:05 +0200
 Subject: [PATCH] media: ipu3-cio2: Add headers that ipu3-cio2.h is direct user
@@ -513,9 +513,9 @@ index ccf0b85ae36f..62187ab5ae43 100644
  #define CIO2_DEVICE_NAME				"Intel IPU3 CIO2"
  #define CIO2_ENTITY_NAME				"ipu3-csi2"
 -- 
-2.30.1
+2.30.2
 
-From dfaa9d2c373eebd0cbb847c0061313e819171539 Mon Sep 17 00:00:00 2001
+From 9983a794be388d4346ceca7d80261c07f79c912f Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 24 Oct 2020 22:42:28 +0100
 Subject: [PATCH] device property: Return true in fwnode_device_is_available
@@ -558,9 +558,9 @@ index 4c43d30145c6..bc9c634df6df 100644
  }
  EXPORT_SYMBOL_GPL(fwnode_device_is_available);
 -- 
-2.30.1
+2.30.2
 
-From f7ac530eac31ce194aa95a7e1176f1b32c2e99f3 Mon Sep 17 00:00:00 2001
+From 109f8a165eb98746ee99c8b588f2132731778d59 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 21 Nov 2020 22:06:38 +0000
 Subject: [PATCH] device property: Call fwnode_graph_get_endpoint_by_id() for
@@ -602,9 +602,9 @@ index bc9c634df6df..ddba75d90af2 100644
  EXPORT_SYMBOL_GPL(fwnode_graph_get_endpoint_by_id);
  
 -- 
-2.30.1
+2.30.2
 
-From d5829d687876a7a82e4a2abd19d715dbb5254f09 Mon Sep 17 00:00:00 2001
+From 329ff70f9c8f63fc640da089467e19da0aa5d200 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 25 Oct 2020 22:49:08 +0000
 Subject: [PATCH] software_node: Enforce parent before child ordering of nodes
@@ -629,7 +629,7 @@ Patchset: cameras
  1 file changed, 30 insertions(+), 12 deletions(-)
 
 diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
-index 615a0c93e116..ade49173ff8d 100644
+index 206bd4d7d7e2..eb89bdb9232c 100644
 --- a/drivers/base/swnode.c
 +++ b/drivers/base/swnode.c
 @@ -692,7 +692,11 @@ swnode_register(const struct software_node *node, struct swnode *parent,
@@ -705,9 +705,9 @@ index 615a0c93e116..ade49173ff8d 100644
  }
  EXPORT_SYMBOL_GPL(software_node_unregister_nodes);
 -- 
-2.30.1
+2.30.2
 
-From 41bfa055214cb8485bed4d57894d42d0140632df Mon Sep 17 00:00:00 2001
+From 06874aa3844f17d3a00fbebddfbf91106adc1746 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 21 Oct 2020 22:25:03 +0100
 Subject: [PATCH] software_node: unregister software_nodes in reverse order
@@ -728,7 +728,7 @@ Patchset: cameras
  1 file changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
-index ade49173ff8d..1f43c51b431e 100644
+index eb89bdb9232c..032b24f60c78 100644
 --- a/drivers/base/swnode.c
 +++ b/drivers/base/swnode.c
 @@ -779,16 +779,23 @@ EXPORT_SYMBOL_GPL(software_node_register_node_group);
@@ -760,9 +760,9 @@ index ade49173ff8d..1f43c51b431e 100644
  }
  EXPORT_SYMBOL_GPL(software_node_unregister_node_group);
 -- 
-2.30.1
+2.30.2
 
-From 0c4de965e317b17f4615a0ed7904311ef7009d7c Mon Sep 17 00:00:00 2001
+From a6074f038607262c585f5b690b021d571f1e1b6b Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Tue, 22 Dec 2020 13:09:05 +0000
 Subject: [PATCH] device property: Define format macros for ports and endpoints
@@ -801,9 +801,9 @@ index 9506f8ec0974..72d36d46287d 100644
  
  /**
 -- 
-2.30.1
+2.30.2
 
-From 1e7bd88e7b159c2855508d4585fb57a236de44c7 Mon Sep 17 00:00:00 2001
+From 62d7cfb7c0ca943b983b5bb84742f1bb0163af35 Mon Sep 17 00:00:00 2001
 From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
 Date: Tue, 15 Sep 2020 15:47:46 +0100
 Subject: [PATCH] software_node: Add support for fwnode_graph*() family of
@@ -836,7 +836,7 @@ Patchset: cameras
  1 file changed, 114 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
-index 1f43c51b431e..2ff504aca0be 100644
+index 032b24f60c78..7f056c5e0ed3 100644
 --- a/drivers/base/swnode.c
 +++ b/drivers/base/swnode.c
 @@ -540,6 +540,115 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode,
@@ -969,9 +969,9 @@ index 1f43c51b431e..2ff504aca0be 100644
  
  /* -------------------------------------------------------------------------- */
 -- 
-2.30.1
+2.30.2
 
-From 298847e9dfbfa7f4b7a59837b05dc53f5ddfbaa5 Mon Sep 17 00:00:00 2001
+From 341e329cf016c445d4701f9ef0addcac5f25d71b Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Oct 2020 23:07:22 +0100
 Subject: [PATCH] lib/test_printf.c: Use helper function to unwind array of
@@ -1007,9 +1007,9 @@ index 7ac87f18a10f..7d60f24240a4 100644
  
  static void __init
 -- 
-2.30.1
+2.30.2
 
-From fb322fd7c12d58f08ebf8a282fa92ff54c5ae0f3 Mon Sep 17 00:00:00 2001
+From 1ab7f63215f2ec845ef850aca7e1860157dde527 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Oct 2020 23:11:36 +0100
 Subject: [PATCH] ipu3-cio2: Add T: entry to MAINTAINERS
@@ -1038,9 +1038,9 @@ index 281de213ef47..5a1c6e959aa8 100644
  F:	drivers/media/pci/intel/ipu3/
  
 -- 
-2.30.1
+2.30.2
 
-From 4569fa0eb71334b63729468dffdb0cd2e93b30f3 Mon Sep 17 00:00:00 2001
+From ea5115ed1cf8360c44195f24d81f932d76d59fdf Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Oct 2020 22:47:21 +0100
 Subject: [PATCH] ipu3-cio2: Rename ipu3-cio2.c
@@ -1073,9 +1073,9 @@ similarity index 100%
 rename from drivers/media/pci/intel/ipu3/ipu3-cio2.c
 rename to drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
 -- 
-2.30.1
+2.30.2
 
-From 72022e158e12175fd368f5ac7977e3b0b46ba791 Mon Sep 17 00:00:00 2001
+From 4826865e0eeb21c5598a1438c636706dad104a8b Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 21 Oct 2020 21:53:05 +0100
 Subject: [PATCH] media: v4l2-core: v4l2-async: Check sd->fwnode->secondary in
@@ -1114,9 +1114,9 @@ index e3ab003a6c85..9dd896d085ec 100644
  	 * Otherwise, check if the sd fwnode and the asd fwnode refer to an
  	 * endpoint or a device. If they're of the same type, there's no match.
 -- 
-2.30.1
+2.30.2
 
-From d79b943e54fa699b597842a0b62b569caa750de4 Mon Sep 17 00:00:00 2001
+From 3fae01f6bbc4aa51e468c8a3c0a9cb2505c3d5cc Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 15 Nov 2020 08:15:34 +0000
 Subject: [PATCH] ACPI / bus: Add acpi_dev_get_next_match_dev() and helper
@@ -1223,9 +1223,9 @@ index 6d1879bf9440..02a716a0af5d 100644
  {
  	put_device(&adev->dev);
 -- 
-2.30.1
+2.30.2
 
-From c727db566a43fd685569f09d57d72a85bd339091 Mon Sep 17 00:00:00 2001
+From ef702165219a6b620851c0f33eaafb64e7a40a89 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 19 Dec 2020 23:55:04 +0000
 Subject: [PATCH] media: v4l2-fwnode: Include v4l2_fwnode_bus_type
@@ -1300,9 +1300,9 @@ index ed0840f3d5df..6ca337c28b3c 100644
   * v4l2_fwnode_endpoint_parse() - parse all fwnode node properties
   * @fwnode: pointer to the endpoint's fwnode handle
 -- 
-2.30.1
+2.30.2
 
-From ef0056003dc297a18494d1c517dd9e53c2150cf0 Mon Sep 17 00:00:00 2001
+From 811018e0c8ef836efefa459c24a62ae7a65348d1 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 21 Oct 2020 21:53:44 +0100
 Subject: [PATCH] ipu3-cio2: Add cio2-bridge to ipu3-cio2 driver
@@ -1898,9 +1898,9 @@ index 62187ab5ae43..dc3e343a37fb 100644
 +
  #endif
 -- 
-2.30.1
+2.30.2
 
-From a4bbca15d0dee2756ce041dc438227891e283e7c Mon Sep 17 00:00:00 2001
+From 0d687a01267776d95f62735bb9a2520f73de3c3c Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 2 Dec 2020 12:38:10 +0000
 Subject: [PATCH] acpi: utils: move acpi_lpss_dep() to utils
@@ -2000,9 +2000,9 @@ index ddca1550cce6..78b38775f18b 100644
   * acpi_dev_present - Detect that a given ACPI device is present
   * @hid: Hardware ID of the device.
 -- 
-2.30.1
+2.30.2
 
-From b6f77009e486d7702153f6e3f2b2f924ef57f6fb Mon Sep 17 00:00:00 2001
+From b9342418bbc392c0d4fe90dea099b82596035577 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 26 Nov 2020 21:12:41 +0000
 Subject: [PATCH] acpi: utils: Add function to fetch dependent acpi_devices
@@ -2086,9 +2086,9 @@ index 02a716a0af5d..33deb22294f2 100644
  acpi_dev_get_next_match_dev(struct acpi_device *adev, const char *hid, const char *uid, s64 hrv);
  struct acpi_device *
 -- 
-2.30.1
+2.30.2
 
-From a2f8589451cea571342385699975efa9fefdc50d Mon Sep 17 00:00:00 2001
+From 5c172223215ee88fb74e1d0b0c8125fdc3aa8035 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 16 Nov 2020 21:38:49 +0000
 Subject: [PATCH] i2c: i2c-core-base: Use format macro in i2c_dev_set_name()
@@ -2154,9 +2154,9 @@ index 56622658b215..65acae61dc5c 100644
  {
  	return NULL;
 -- 
-2.30.1
+2.30.2
 
-From 588a3270324a2ebfaec98add9342fa9cd1993d36 Mon Sep 17 00:00:00 2001
+From 9d7575d12c59a6c660c5867186f586aaece9db3b Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 2 Dec 2020 16:41:42 +0000
 Subject: [PATCH] i2c: i2c-core-acpi: Add i2c_acpi_dev_name()
@@ -2212,9 +2212,9 @@ index 65acae61dc5c..b82aac05b17f 100644
  #else
  static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
 -- 
-2.30.1
+2.30.2
 
-From 39497507992b2c4f2e106a734ed16c43b84cbe2e Mon Sep 17 00:00:00 2001
+From fd0f60658d3c4d629976fd24d0830a6417d3c488 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 16 Nov 2020 00:16:56 +0000
 Subject: [PATCH] gpio: gpiolib-acpi: Export acpi_get_gpiod()
@@ -2232,7 +2232,7 @@ Patchset: cameras
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
-index 834a12f3219e..cfadbc263475 100644
+index 49a1f8ce4baa..36fc17c921f0 100644
 --- a/drivers/gpio/gpiolib-acpi.c
 +++ b/drivers/gpio/gpiolib-acpi.c
 @@ -111,7 +111,7 @@ static int acpi_gpiochip_find(struct gpio_chip *gc, void *data)
@@ -2253,18 +2253,18 @@ index 834a12f3219e..cfadbc263475 100644
  static irqreturn_t acpi_gpio_irq_handler(int irq, void *data)
  {
 diff --git a/include/linux/acpi.h b/include/linux/acpi.h
-index 5b1dc1ad4fb3..47ae139e8781 100644
+index 9e173c6f312d..90665e538462 100644
 --- a/include/linux/acpi.h
 +++ b/include/linux/acpi.h
 @@ -1073,6 +1073,7 @@ void __acpi_handle_debug(struct _ddebug *descriptor, acpi_handle handle, const c
  bool acpi_gpio_get_irq_resource(struct acpi_resource *ares,
  				struct acpi_resource_gpio **agpio);
- int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index);
+ int acpi_dev_gpio_irq_get_by(struct acpi_device *adev, const char *name, int index);
 +struct gpio_desc *acpi_get_gpiod(char *path, int pin);
  #else
  static inline bool acpi_gpio_get_irq_resource(struct acpi_resource *ares,
  					      struct acpi_resource_gpio **agpio)
-@@ -1083,6 +1084,10 @@ static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
+@@ -1084,6 +1085,10 @@ static inline int acpi_dev_gpio_irq_get_by(struct acpi_device *adev,
  {
  	return -ENXIO;
  }
@@ -2274,11 +2274,11 @@ index 5b1dc1ad4fb3..47ae139e8781 100644
 +}
  #endif
  
- /* Device properties */
+ static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
 -- 
-2.30.1
+2.30.2
 
-From a4a562f653decc1f7f75ba334761f2c0cb660d7e Mon Sep 17 00:00:00 2001
+From 51642aa016cca8054d33d940f29cf766116723dd Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 12 Dec 2020 23:56:59 +0000
 Subject: [PATCH] mfd: Remove tps68470 MFD driver
@@ -2467,9 +2467,9 @@ index 4a4df4ffd18c..000000000000
 -};
 -builtin_i2c_driver(tps68470_driver);
 -- 
-2.30.1
+2.30.2
 
-From b595f24e55b231e1b51a001387e5ea32acdf5746 Mon Sep 17 00:00:00 2001
+From 33f22ee9f815cf45ad3348ad867387d33b6c0714 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 15 Jan 2021 12:37:31 +0000
 Subject: [PATCH] platform: x86: Add intel_skl_int3472 driver
@@ -3436,9 +3436,9 @@ index 000000000000..3fe27ec0caff
 +	return ret;
 +}
 -- 
-2.30.1
+2.30.2
 
-From 8e4703223f189aa81f9c7b02ac4e33a898a7417f Mon Sep 17 00:00:00 2001
+From 11d57a6cfe78f3f3de1a96100efd802b01897e7f Mon Sep 17 00:00:00 2001
 From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 Date: Fri, 11 Dec 2020 21:17:35 +0100
 Subject: [PATCH] PCI: ACPI: Fix up ACPI companion lookup for device 0 on the
@@ -3506,9 +3506,9 @@ index 745a4e0c4994..87e45a800919 100644
  
  /**
 -- 
-2.30.1
+2.30.2
 
-From c7ed7462d16ffc20cb8c51dc75cbc69278109612 Mon Sep 17 00:00:00 2001
+From 27f904fbaea1530f46c3bf0e14b047dcfc19669c Mon Sep 17 00:00:00 2001
 From: Jake Day <jake@ninebysix.com>
 Date: Fri, 25 Sep 2020 10:24:53 -0400
 Subject: [PATCH] media: i2c: Add support for the OV5693 image sensor
@@ -6863,9 +6863,9 @@ index 000000000000..9a508e1f3624
 +static unsigned long N_RES = N_RES_VIDEO;
 +#endif
 -- 
-2.30.1
+2.30.2
 
-From 26bc1d4e7d8bf1af29ca5be8e358c52eb51cf249 Mon Sep 17 00:00:00 2001
+From bc237107a26c85119660a043309c693f58fb2aa5 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 17 Jan 2021 19:08:18 +0000
 Subject: [PATCH] media: i2c: Add reset pin toggling to ov5693
@@ -6904,9 +6904,9 @@ index 32485e4ed42b..f9ced52ad37a 100644
  
  	if (dev->indicator_led)
 -- 
-2.30.1
+2.30.2
 
-From 5a74660b40475341b846abe4e4633d96329ee57a Mon Sep 17 00:00:00 2001
+From 0b494ed2be772e55ac23eaf2d5bbf12925334fab Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 17 Jan 2021 21:39:15 +0000
 Subject: [PATCH] media: i2c: Fix misnamed variable in power_down() for ov5693
@@ -6933,9 +6933,9 @@ index f9ced52ad37a..9fd44a3d1d85 100644
  	clk_disable_unprepare(dev->clk);
  
 -- 
-2.30.1
+2.30.2
 
-From acb2613e770c90b092e9fa6ef6da7dd72036ac50 Mon Sep 17 00:00:00 2001
+From 22fa70bc51a1b836de5f5f31badf4abe378b4666 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 Date: Fri, 22 Jan 2021 20:58:13 +0100
 Subject: [PATCH] cio2-bridge: Parse sensor orientation and rotation
@@ -7096,9 +7096,9 @@ index dd0ffcafa489..924d99d20328 100644
  	struct property_entry ep_properties[5];
  	struct property_entry dev_properties[3];
 -- 
-2.30.1
+2.30.2
 
-From 2a1100a910b11fb01d65059f05ca86220e18cff4 Mon Sep 17 00:00:00 2001
+From 12cd753c1b64eba63005c98976845f5a54518bb2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 Date: Fri, 22 Jan 2021 21:23:47 +0100
 Subject: [PATCH] ov5693: Add orientation and rotation controls
@@ -7152,9 +7152,9 @@ index 9fd44a3d1d85..1a85800df7ed 100644
  	ov5693->ctrl_handler.lock = &ov5693->input_lock;
  	ov5693->sd.ctrl_handler = &ov5693->ctrl_handler;
 -- 
-2.30.1
+2.30.2
 
-From eda2c584736f68824078f435b66fcaf8d9909a6c Mon Sep 17 00:00:00 2001
+From abcd115a9070b280414e61a7478a423efbd75777 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 23 Jan 2021 00:28:32 +0000
 Subject: [PATCH] platform: x86: Stylistic updates for intel-skl-int3472
@@ -7569,9 +7569,9 @@ index 3fe27ec0caff..40629291b339 100644
  		return -EINVAL;
  
 -- 
-2.30.1
+2.30.2
 
-From 16f13a4470eee4035f4bb0cef791f0f0e6e55cc2 Mon Sep 17 00:00:00 2001
+From f2d843c353ece834737ff11868d5d9d7d5d9f389 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 23 Jan 2021 00:30:15 +0000
 Subject: [PATCH] platform: x86: Add recalc_rate opp to int3472-discrete clock
@@ -7696,9 +7696,9 @@ index 42ae8396eb64..98eb1ec3399e 100644
  
  	acpi_dev_put(int3472->sensor);
 -- 
-2.30.1
+2.30.2
 
-From 3b1abbe703a989ec3585d4ec69168b8bea3e6527 Mon Sep 17 00:00:00 2001
+From a6a81223e72a8483d2eaaf58ab54e2555815f038 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 Date: Sun, 24 Jan 2021 11:07:42 +0100
 Subject: [PATCH] cio2-bridge: Use macros and add warnings
@@ -7800,9 +7800,9 @@ index 924d99d20328..e1e388cc9f45 100644
  	(const struct cio2_sensor_config) {	\
  		.hid = _HID,			\
 -- 
-2.30.1
+2.30.2
 
-From c7ab0599026cb5feec200917a9d7d02c970bc244 Mon Sep 17 00:00:00 2001
+From 268bfe7e4bf86c0b40a8651f217f7834da62b35d Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 8 Feb 2021 21:44:38 +0000
 Subject: [PATCH] media: i2c: Tidy up ov5693_init_controls()
@@ -7922,9 +7922,9 @@ index 9a508e1f3624..26819cf3f4d2 100644
  
  enum ov5693_tok_type {
 -- 
-2.30.1
+2.30.2
 
-From c98216a72b1fa2dae70866cf40a2861561655a0e Mon Sep 17 00:00:00 2001
+From 1e98f60bf1e65faefb86567d36c29b71b4e728fb Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 8 Feb 2021 21:46:49 +0000
 Subject: [PATCH] media: i2c: Remove OV5693_PPL_DEFAULT
@@ -7960,9 +7960,9 @@ index a9747ab783d7..7fb368eec327 100644
  						 V4L2_CID_HBLANK, hblank, hblank,
  						 1, hblank);
 -- 
-2.30.1
+2.30.2
 
-From c64bcb33d35a4661bbc7f47038f4e842ffbd98f8 Mon Sep 17 00:00:00 2001
+From 9297c7918cb4b9b4cdfa98333522e008bb790e5e Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 8 Feb 2021 22:53:02 +0000
 Subject: [PATCH] media: i2c: Add vblank control to ov5693 driver
@@ -8036,9 +8036,9 @@ index 26819cf3f4d2..9d7eed97963b 100644
  
  };
 -- 
-2.30.1
+2.30.2
 
-From 5936b342529158523867fbac7f4a02f10f37ba18 Mon Sep 17 00:00:00 2001
+From ae68c6d24645001813d34bc971e8b9ab7c66ba64 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 10 Feb 2021 00:36:32 +0000
 Subject: [PATCH] media: i2c: update exposure control for ov5693
@@ -8111,9 +8111,9 @@ index 1950d7ac2d54..cea767230aa9 100644
  	/* Gain */
  
 -- 
-2.30.1
+2.30.2
 
-From 5dd29397e21e3388233d1fa20651dc11680bd4b4 Mon Sep 17 00:00:00 2001
+From feb7b3dad0342f6f204ce508f973e791829a837f Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 10 Feb 2021 00:39:42 +0000
 Subject: [PATCH] media: i2c: Fix incorrect bit-setting
@@ -8147,9 +8147,9 @@ index cea767230aa9..f681dbfcec56 100644
  
  #define OV5693_GAIN_CTRL_H_REG			0x3504
 -- 
-2.30.1
+2.30.2
 
-From 3ab19f7ca30b841d73458c9c4e136c3721fc9047 Mon Sep 17 00:00:00 2001
+From dedef3a3103da184484bc2246fffe3a7bba667c7 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 10 Feb 2021 16:25:48 +0000
 Subject: [PATCH] media: i2c: Don't set stream on during mode config
@@ -8297,9 +8297,9 @@ index 9d7eed97963b..965208078c2b 100644
  };
  
 -- 
-2.30.1
+2.30.2
 
-From 31055383a0a5af5e58609177a5423dadaacbe25d Mon Sep 17 00:00:00 2001
+From 4b2a0fc7ff3bfafb29f1ba3f8d15914e9d980613 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 10 Feb 2021 16:35:24 +0000
 Subject: [PATCH] media: i2c: Update gain control for ov5693
@@ -8369,9 +8369,9 @@ index f681dbfcec56..51eb3b05d121 100644
  	/* Flip */
  
 -- 
-2.30.1
+2.30.2
 
-From 478b272458e849312e2fc544ab4acfaf90554d69 Mon Sep 17 00:00:00 2001
+From 7716c04bcf788584916b1987a0ef85c32b1ed726 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 10 Feb 2021 23:44:39 +0000
 Subject: [PATCH] media: i2c: Fixup gain read
@@ -8432,9 +8432,9 @@ index 51eb3b05d121..952558c4f33b 100644
  }
  
 -- 
-2.30.1
+2.30.2
 
-From 7638fbac2e6c4ba7a06d096a8c8269d1d59eed7a Mon Sep 17 00:00:00 2001
+From ece80045a1df10adc93f000a8c9860acb2606d45 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 11 Feb 2021 00:40:10 +0000
 Subject: [PATCH] media: i2c: Update controls on stream
@@ -8467,9 +8467,9 @@ index 952558c4f33b..dd31083eeb7b 100644
  			       enable ? OV5693_START_STREAMING :
  			       OV5693_STOP_STREAMING);
 -- 
-2.30.1
+2.30.2
 
-From bfa85e6e6ca72c64a6854947667af07ad6a615bf Mon Sep 17 00:00:00 2001
+From 1b5c9ae184f7e6f03de90bb32fe95fc7271c6203 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 11 Feb 2021 23:29:15 +0000
 Subject: [PATCH] media: i2c: Correct link frequency value
@@ -8506,9 +8506,9 @@ index 965208078c2b..7f1d31a82d3d 100644
  
  #define OV5693_NUM_SUPPLIES             2
 -- 
-2.30.1
+2.30.2
 
-From def629ed22f244789db7952c4cfa30ffff3dae6b Mon Sep 17 00:00:00 2001
+From 274114ec9e272ecbcd1a862b674ec6e4fc023837 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 25 Jan 2021 23:12:09 +0000
 Subject: [PATCH] media: i2c: Cleanup ov5693 driver
@@ -9427,9 +9427,9 @@ index 7f1d31a82d3d..70ccb3aae4c7 100644
          struct regulator_bulk_data supplies[OV5693_NUM_SUPPLIES];
  	struct clk *clk;
 -- 
-2.30.1
+2.30.2
 
-From bcdacaeeba0d758f8d318f75d57e8e4b38e36076 Mon Sep 17 00:00:00 2001
+From b2bf7a4b6e5244680d916084e2046ae85e809be3 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 28 Jan 2021 12:04:38 +0000
 Subject: [PATCH] media: i2c: Add pm_runtime support to ov5693 driver
@@ -9772,9 +9772,9 @@ index 70ccb3aae4c7..b78d3b474a43 100644
  	struct camera_sensor_platform_data *platform_data;
  	ktime_t timestamp_t_focus_abs;
 -- 
-2.30.1
+2.30.2
 
-From 026275b89a6960c9537669b8da495a5795256dec Mon Sep 17 00:00:00 2001
+From 66973c7cdead5a541631afb5fd054243b4edc4b5 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 28 Jan 2021 12:07:36 +0000
 Subject: [PATCH] media: i2c: Remove old power methods from ov5693
@@ -9943,9 +9943,9 @@ index f2eaa5f71a31..ce26ce86fbd5 100644
  	.pad = &ov5693_pad_ops,
  };
 -- 
-2.30.1
+2.30.2
 
-From c7b9a6abdc1f6d279a577b60c1618abf35a83602 Mon Sep 17 00:00:00 2001
+From fec6bb9616a378b578a842b02ab6a477ba297891 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 28 Jan 2021 12:14:00 +0000
 Subject: [PATCH] media: i2c: Trim unused headers from ov5693
@@ -9984,9 +9984,9 @@ index ce26ce86fbd5..b3b391a49fdb 100644
  #include <media/v4l2-fwnode.h>
  
 -- 
-2.30.1
+2.30.2
 
-From 5db2873f79b231f4c4850e58dec526b561d9085f Mon Sep 17 00:00:00 2001
+From f8f19b4ea87b708af9cb5992bee8764363843bb7 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 13 Feb 2021 21:39:35 +0000
 Subject: [PATCH] media: i2c: Remove VCM stuff
@@ -10403,9 +10403,9 @@ index b3b391a49fdb..2c82b6578de9 100644
  
  	v4l2_i2c_subdev_init(&ov5693->sd, client, &ov5693_ops);
 -- 
-2.30.1
+2.30.2
 
-From f48a9b083a4822c9d3787eeed47c256ada162259 Mon Sep 17 00:00:00 2001
+From c9f5c4feceb62796fffe2e8181d298b320915bd2 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 13 Feb 2021 22:16:08 +0000
 Subject: [PATCH] media: i2c: Tidy up ov5693 sensor init
@@ -10559,9 +10559,9 @@ index 2c82b6578de9..313bc9177328 100644
  	mutex_unlock(&ov5693->lock);
  	return ret;
 -- 
-2.30.1
+2.30.2
 
-From 88aa74b0f5a9a9d0f2864651fbcfa3e0b9804a70 Mon Sep 17 00:00:00 2001
+From 12e766ea7b4d949d5c23d21b18a2d9362452a702 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 12 Feb 2021 16:14:04 +0000
 Subject: [PATCH] media: i2c: cleanup macros in ov5693.h
@@ -10705,9 +10705,9 @@ index b78d3b474a43..6502777eb5f3 100644
  #define OV5693_FRAME_OFF_NUM		0x4202
  #define OV5693_OTP_BYTE_MAX		32	//change to 32 as needed by otpdata
 -- 
-2.30.1
+2.30.2
 
-From 16d5169560fdbb2a2a8c85992c3e21014f0cb6cf Mon Sep 17 00:00:00 2001
+From 0e910f72a75971a70c5007f11730fb5dbf560de4 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 12 Feb 2021 16:19:09 +0000
 Subject: [PATCH] media: i2c: use devm_kzalloc() to initialise ov5693
@@ -10735,9 +10735,9 @@ index 313bc9177328..d092ed698eb3 100644
  		return -ENOMEM;
  
 -- 
-2.30.1
+2.30.2
 
-From 441435af3fbd9f18d509eb6bbe234892a4e9f088 Mon Sep 17 00:00:00 2001
+From a5dd4e398f107f41debff1c35b46432430fc0adf Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 12 Feb 2021 16:26:21 +0000
 Subject: [PATCH] media: i2c: Check for supported clk rate in probe
@@ -10792,9 +10792,9 @@ index 6502777eb5f3..0dfbbe9a0ff2 100644
  #define OV5693_LINK_FREQ_400MHZ		400000000
  /* pixel_rate = link_freq * 2 * nr_of_lanes / bits_per_sample
 -- 
-2.30.1
+2.30.2
 
-From df8c9d7567313943c4a2b1bd2cd97bbd0aea6dfe Mon Sep 17 00:00:00 2001
+From 266c9ccb4b8485f4a744f5e78e45d096084528be Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 13 Feb 2021 23:17:50 +0000
 Subject: [PATCH] media: i2c: Use devres to fetch gpios
@@ -10866,9 +10866,9 @@ index 8082d37841da..c580159079d2 100644
  
  static int ov5693_get_regulators(struct ov5693_device *ov5693)
 -- 
-2.30.1
+2.30.2
 
-From 80a1e8920aecee92b515c2e6d74cf9096f9ef259 Mon Sep 17 00:00:00 2001
+From 5b8e60f57f64a48fbe9fa8378e128fda79b47e96 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 13 Feb 2021 23:20:47 +0000
 Subject: [PATCH] media: i2c: Use devres to fetch regulators
@@ -10909,9 +10909,9 @@ index c580159079d2..9f61b470f8ba 100644
  				       ov5693->supplies);
  }
 -- 
-2.30.1
+2.30.2
 
-From 5533ba50b6d9bc877453396ca999a9aa56d639df Mon Sep 17 00:00:00 2001
+From 3a1c7da52763e1f36a98d227f01a4585e04bd38e Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 14 Feb 2021 12:39:14 +0000
 Subject: [PATCH] media: i2c: remove debug print
@@ -10988,9 +10988,9 @@ index 9f61b470f8ba..622a7ddf4063 100644
  	return 0;
  }
 -- 
-2.30.1
+2.30.2
 
-From 3c16b10440d17b2e68b66decd37e0f3d7bb23196 Mon Sep 17 00:00:00 2001
+From 1560ed83e750007de4391f10f20d786a405819e0 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 14 Feb 2021 14:32:50 +0000
 Subject: [PATCH] media: i2c: Remove unused resolutions from ov5693
@@ -11417,9 +11417,9 @@ index 0dfbbe9a0ff2..29e6735112da 100644
  static unsigned long N_RES = N_RES_VIDEO;
 -#endif
 -- 
-2.30.1
+2.30.2
 
-From 3ed6ebcfb67924b3114da07f941bd1c3b281f7e2 Mon Sep 17 00:00:00 2001
+From 57a36f7b2dbfb51884438ece5fa85075300649c1 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 14 Feb 2021 14:45:58 +0000
 Subject: [PATCH] media: i2c: update set_fmt() for ov5693
@@ -11658,5 +11658,5 @@ index 29e6735112da..0377853f8b2b 100644
  	int otp_size;
  	u8 *otp_data;
 -- 
-2.30.1
+2.30.2
 

patches/5.10/0011-ath10k-firmware-override.patch

@@ -1,4 +1,4 @@
-From c47e7b400cd429947027e8d149d1aab1af4385eb Mon Sep 17 00:00:00 2001
+From 784be48d36c010eddc69069f292c73736f976e1b 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
@@ -116,5 +116,5 @@ index d73ad60b571c..f242fd4b81a6 100644
  	ret = firmware_request_nowarn(&fw, filename, ar->dev);
  	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
 -- 
-2.30.1
+2.30.2