Update v5.10 patches

Changes:
 - WiFi:
   - Add workaround for deep sleep on buggy hardware
   - Fix manual host-sleep activation
   - Fix DELBA requests
   - Ignore BTCOEX events as they are sometimes buggy (improves WiFi
     speeds)
   - Other small fixes

 - SAM:
   - Code cleanup and small fixes

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/db2f9336a2e93dd41d68e15d0563f899f33f1cbb
 - SAM: https://github.com/linux-surface/surface-aggregator-module/commit/a33f6762bee1b6c0650889445648377dde8508d7

patches/5.10/0001-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 93ddab66935d29284f096ae2997ab8cc0c0854fc Mon Sep 17 00:00:00 2001
+From f8e30b05c475b4d2469ee028a3425c15ea06f1fa 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

patches/5.10/0002-wifi.patch

@@ -1,4 +1,4 @@
-From 39ff2bc389326a9ac9424ba7f7b30941c72b7162 Mon Sep 17 00:00:00 2001
+From 9fd55ebcbc1b9ed6b87cb1e5304d7707d20dbc02 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
@@ -206,7 +206,7 @@ index 000000000000..5326ae7e5671
 -- 
 2.31.1
 
-From ebbb55cf839072eaa7fde87edb1e833718cb7656 Mon Sep 17 00:00:00 2001
+From d11fe3d6d2e588555f0ee035959b2c7837191d77 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+
@@ -407,7 +407,7 @@ index 5326ae7e5671..8b9dcb5070d8 100644
 -- 
 2.31.1
 
-From beba510c3ae9eb37c0554f0d88c229cf8611f191 Mon Sep 17 00:00:00 2001
+From 40974a2b1fbfda4c7901b0c7c1fb2acfdc9a1251 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
@@ -586,7 +586,7 @@ index 8b9dcb5070d8..3ef7440418e3 100644
 -- 
 2.31.1
 
-From 32bb8023bf71dbd48f3ef3f2368e05ceb346c8f9 Mon Sep 17 00:00:00 2001
+From 25a9e012553522f50ae04146c93e5c4be4cc2e26 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
@@ -648,7 +648,7 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
 -- 
 2.31.1
 
-From cf97713f83494149cc71e344415b917f654e812b Mon Sep 17 00:00:00 2001
+From 8e11b48f62205eeba4fdee9f05e3060e43006146 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+
@@ -803,7 +803,7 @@ index 3ef7440418e3..a95ebac06e13 100644
 -- 
 2.31.1
 
-From 98a436bbea1c6820a15a2a34ab9daca521a6040e Mon Sep 17 00:00:00 2001
+From 7c88d7dd1e7a7a0f723063f1f5b36ed59cc11fda Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 10 Nov 2020 12:49:56 +0100
 Subject: [PATCH] mwifiex: Use non-posted PCI register writes
@@ -860,7 +860,7 @@ index fcedc663ccc7..5eea6cb73fb7 100644
 -- 
 2.31.1
 
-From b0883dbe1c1d7a27679d34b1c5f7f24816bef57d Mon Sep 17 00:00:00 2001
+From b3b5bd3b26a122b2a3c3884db4a600d3b1f95d6b 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
@@ -1027,7 +1027,7 @@ index a95ebac06e13..4ec2ae72f632 100644
 -- 
 2.31.1
 
-From 9acc247dbf359c9bd348ef46a05a801e56a3a9dc Mon Sep 17 00:00:00 2001
+From c4383694d5f502645bd6839c0c6d713256497c6d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Sun, 28 Mar 2021 21:10:06 +0200
 Subject: [PATCH] mwifiex: Try waking the firmware until we get an interrupt
@@ -1116,7 +1116,7 @@ index 7dc54c446559..505a90743f2f 100644
 -- 
 2.31.1
 
-From c0b9d1002524687cc9d8a9b2d4f9c80bcb373820 Mon Sep 17 00:00:00 2001
+From a8b8734cbbe2e813c29e36a59261f88775db74db 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
@@ -1194,7 +1194,7 @@ index 2953b96b3ced..3459ee86530c 100644
 -- 
 2.31.1
 
-From 49b7afd20625f89244f9284edd3484640c6d3d9f Mon Sep 17 00:00:00 2001
+From 05b88cd723063a9081f6ec4a036bde9f9bdaf71e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 12:31:26 +0100
 Subject: [PATCH] mwifiex: Small cleanup for handling virtual interface type
@@ -1295,7 +1295,7 @@ index a6b9dc6700b1..d50fd8570475 100644
 -- 
 2.31.1
 
-From 58c87f5bf44d6a5f8e301a4131d55b828d6eb96e Mon Sep 17 00:00:00 2001
+From 0e47c875bc9b6ac9f1a40c90916042911169e9fa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 12:44:39 +0100
 Subject: [PATCH] mwifiex: Use function to check whether interface type change
@@ -1528,7 +1528,7 @@ index d50fd8570475..3a79a55bbfd2 100644
 -- 
 2.31.1
 
-From 1bc073550135ded9107754bbae92a81367edc91a Mon Sep 17 00:00:00 2001
+From fd6d71fb9c9f497180c9817a0a967582b76b8e21 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 13:33:04 +0100
 Subject: [PATCH] mwifiex: Run SET_BSS_MODE when changing from P2P to STATION
@@ -1596,7 +1596,7 @@ index 3a79a55bbfd2..66e978088061 100644
 -- 
 2.31.1
 
-From fa836797d3835462de121d91353e63de9f0d0013 Mon Sep 17 00:00:00 2001
+From 99e6ae9de4a658148fe63f38bf310e4d5b71e5eb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 14:42:54 +0100
 Subject: [PATCH] mwifiex: Use helper function for counting interface types
@@ -1772,7 +1772,7 @@ index 66e978088061..db30f595e9f9 100644
 -- 
 2.31.1
 
-From 029b06aaf9c58bab9ba728237a3c317048824975 Mon Sep 17 00:00:00 2001
+From 33b6c08a293eb71834d795d92243d36404fd7d11 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Fri, 26 Mar 2021 15:56:58 +0100
 Subject: [PATCH] mwifiex: Update virtual interface counters right after
@@ -1875,7 +1875,7 @@ index db30f595e9f9..60de1cec77c7 100644
 -- 
 2.31.1
 
-From 66296a87c90403f3ff3ee44bc53453cfa11d3e9f Mon Sep 17 00:00:00 2001
+From 2f41912acacfff4105465c002d4441ab2747d577 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 13:42:40 +0100
 Subject: [PATCH] mwifiex: Allow switching interface type from P2P_CLIENT to
@@ -1964,7 +1964,7 @@ index 60de1cec77c7..a37b504bd084 100644
 -- 
 2.31.1
 
-From 72c4a7aaba735787ac6f574fdbf45f32d3d41562 Mon Sep 17 00:00:00 2001
+From 8c41c0c7094651f9d5d2a9bdaa58ae7c8ea58882 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Fri, 26 Mar 2021 15:31:08 +0100
 Subject: [PATCH] mwifiex: Handle interface type changes from AP to STATION
@@ -1991,7 +1991,7 @@ index a37b504bd084..e65f285e3efe 100644
 -- 
 2.31.1
 
-From 530a64f1b73ab05e7e8142d7d4fff11b6fa59886 Mon Sep 17 00:00:00 2001
+From b746e9af8a70f8ff8ff4c47c3d28c4a36a9d9df7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Fri, 26 Mar 2021 15:32:16 +0100
 Subject: [PATCH] mwifiex: Properly initialize private structure on interface
@@ -2046,7 +2046,7 @@ index e65f285e3efe..a290312313f3 100644
 -- 
 2.31.1
 
-From f385aa6c37ff8de85d86351684a7614e76592e8c Mon Sep 17 00:00:00 2001
+From 671cab905d21b0cc5adbed250da46a3dc9c6ecbc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Sat, 27 Mar 2021 12:19:14 +0100
 Subject: [PATCH] mwifiex: Fix copy-paste mistake when creating virtual
@@ -2078,3 +2078,443 @@ index a290312313f3..1e1cf523e228 100644
 -- 
 2.31.1
 
+From 98582f4c190e170c3a25b9020ad04920575bd140 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Tue, 13 Apr 2021 14:30:28 +0200
+Subject: [PATCH] mwifiex: Deactive host sleep using HSCFG after it was
+ activated manually
+
+When powersaving (so either wifi powersaving or deep sleep, depending on
+which state the firmware is in) is disabled, the way the firmware goes
+into host sleep is different: Usually the firmware implicitely enters
+host sleep on the next SLEEP event we get when we configured host sleep
+via HSCFG before. When powersaving is disabled though, there are no
+SLEEP events, the way we enter host sleep in that case is different: The
+firmware will send us a HS_ACT_REQ event and after that we "manually"
+make the firmware enter host sleep by sending it another HSCFG command
+with the action HS_ACTIVATE.
+
+Now waking up from host sleep appears to be different depending on
+whether powersaving is enabled again: When powersaving is enabled, the
+firmware implicitely leaves host sleep as soon as it wakes up and sends
+us an AWAKE event. When powersaving is disabled though, it apparently
+doesn't implicitely leave host sleep, but instead we need to send it a
+HSCFG command with the HS_CONFIGURE action and the HS_CFG_CANCEL
+condition. We didn't do that so far, which is why waking up from host
+sleep was broken when powersaving is disabled.
+
+So add some additional state to mwifiex_adapter where we keep track of
+whether host sleep was activated manually via HS_ACTIVATE, and if that
+was the case, deactivate it manually again via HS_CFG_CANCEL.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/cmdevt.c | 21 +++++++++++++++++++
+ drivers/net/wireless/marvell/mwifiex/main.c   | 18 ++++++++++++++++
+ drivers/net/wireless/marvell/mwifiex/main.h   |  1 +
+ .../net/wireless/marvell/mwifiex/sta_cmd.c    |  4 ++++
+ 4 files changed, 44 insertions(+)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+index 3a11342a6bde..5487df8f994d 100644
+--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
++++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+@@ -608,6 +608,11 @@ int mwifiex_send_cmd(struct mwifiex_private *priv, u16 cmd_no,
+ 		return -1;
+ 	}
+ 
++	if (priv->adapter->hs_activated_manually &&
++	    cmd_no != HostCmd_CMD_802_11_HS_CFG_ENH) {
++		mwifiex_cancel_hs(priv, MWIFIEX_ASYNC_CMD);
++		priv->adapter->hs_activated_manually = false;
++	}
+ 
+ 	/* Get a new command node */
+ 	cmd_node = mwifiex_get_cmd_node(adapter);
+@@ -714,6 +719,15 @@ mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,
+ 		}
+ 	}
+ 
++	/* Same with exit host sleep cmd, luckily that can't happen at the same time as EXIT_PS */
++	if (command == HostCmd_CMD_802_11_HS_CFG_ENH) {
++		struct host_cmd_ds_802_11_hs_cfg_enh *hs_cfg =
++			&host_cmd->params.opt_hs_cfg;
++
++		if (le16_to_cpu(hs_cfg->action) == HS_ACTIVATE)
++				add_tail = false;
++	}
++
+ 	spin_lock_bh(&adapter->cmd_pending_q_lock);
+ 	if (add_tail)
+ 		list_add_tail(&cmd_node->list, &adapter->cmd_pending_q);
+@@ -1216,6 +1230,13 @@ mwifiex_process_hs_config(struct mwifiex_adapter *adapter)
+ 		    __func__);
+ 
+ 	adapter->if_ops.wakeup(adapter);
++
++	if (adapter->hs_activated_manually) {
++		mwifiex_cancel_hs(mwifiex_get_priv (adapter, MWIFIEX_BSS_ROLE_ANY),
++				  MWIFIEX_ASYNC_CMD);
++		adapter->hs_activated_manually = false;
++	}
++
+ 	adapter->hs_activated = false;
+ 	clear_bit(MWIFIEX_IS_HS_CONFIGURED, &adapter->work_flags);
+ 	clear_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags);
+diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
+index 6283df5aaaf8..b30547d1f153 100644
+--- a/drivers/net/wireless/marvell/mwifiex/main.c
++++ b/drivers/net/wireless/marvell/mwifiex/main.c
+@@ -401,6 +401,12 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
+ 		     !adapter->scan_processing) &&
+ 		    !adapter->data_sent &&
+ 		    !skb_queue_empty(&adapter->tx_data_q)) {
++			if (adapter->hs_activated_manually) {
++				mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY),
++						  MWIFIEX_ASYNC_CMD);
++				adapter->hs_activated_manually = false;
++			}
++
+ 			mwifiex_process_tx_queue(adapter);
+ 			if (adapter->hs_activated) {
+ 				clear_bit(MWIFIEX_IS_HS_CONFIGURED,
+@@ -418,6 +424,12 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
+ 		    !mwifiex_bypass_txlist_empty(adapter) &&
+ 		    !mwifiex_is_tdls_chan_switching
+ 			(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA))) {
++			if (adapter->hs_activated_manually) {
++				mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY),
++						  MWIFIEX_ASYNC_CMD);
++				adapter->hs_activated_manually = false;
++			}
++
+ 			mwifiex_process_bypass_tx(adapter);
+ 			if (adapter->hs_activated) {
+ 				clear_bit(MWIFIEX_IS_HS_CONFIGURED,
+@@ -434,6 +446,12 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
+ 		    !adapter->data_sent && !mwifiex_wmm_lists_empty(adapter) &&
+ 		    !mwifiex_is_tdls_chan_switching
+ 			(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA))) {
++			if (adapter->hs_activated_manually) {
++				mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY),
++						  MWIFIEX_ASYNC_CMD);
++				adapter->hs_activated_manually = false;
++			}
++
+ 			mwifiex_wmm_process_tx(adapter);
+ 			if (adapter->hs_activated) {
+ 				clear_bit(MWIFIEX_IS_HS_CONFIGURED,
+diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
+index 5923c5c14c8d..90012cbcfd15 100644
+--- a/drivers/net/wireless/marvell/mwifiex/main.h
++++ b/drivers/net/wireless/marvell/mwifiex/main.h
+@@ -986,6 +986,7 @@ struct mwifiex_adapter {
+ 	struct timer_list wakeup_timer;
+ 	struct mwifiex_hs_config_param hs_cfg;
+ 	u8 hs_activated;
++	u8 hs_activated_manually;
+ 	u16 hs_activate_wait_q_woken;
+ 	wait_queue_head_t hs_activate_wait_q;
+ 	u8 event_body[MAX_EVENT_SIZE];
+diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+index d3a968ef21ef..76db9a7b8199 100644
+--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
++++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+@@ -396,6 +396,10 @@ mwifiex_cmd_802_11_hs_cfg(struct mwifiex_private *priv,
+ 	if (hs_activate) {
+ 		hs_cfg->action = cpu_to_le16(HS_ACTIVATE);
+ 		hs_cfg->params.hs_activate.resp_ctrl = cpu_to_le16(RESP_NEEDED);
++
++		adapter->hs_activated_manually = true;
++		mwifiex_dbg(priv->adapter, CMD,
++			    "cmd: Activating host sleep manually\n");
+ 	} else {
+ 		hs_cfg->action = cpu_to_le16(HS_CONFIGURE);
+ 		hs_cfg->params.hs_config.conditions = hscfg_param->conditions;
+-- 
+2.31.1
+
+From d3b5ba4321d31e42162227d948daada5539c2f77 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Tue, 13 Apr 2021 14:23:05 +0200
+Subject: [PATCH] mwifiex: Add quirk to disable deep sleep with certain
+ hardware revision
+
+The 88W8897 pcie card with the hardware revision 20 apparently has a
+hardware issue where the card wakes up from deep sleep randomly and very
+often, somewhat depending on the card activity, maybe the hardware has a
+floating wakeup pin or something.
+
+Those continuous wakeups prevent the card from entering host sleep when
+the computer suspends. And because the host won't answer to events from
+the card anymore while it's suspended, the firmwares internal
+powersaving state machine seems to get confused and the card can't sleep
+anymore at all after that.
+
+Since we can't work around that hardware bug in the firmware, let's
+get the hardware revision string from the firmware and match it with
+known bad revisions. Then disable auto deep sleep for those revisions,
+which makes sure we no longer get those spurious wakeups.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/main.c      | 14 ++++++++++++++
+ drivers/net/wireless/marvell/mwifiex/main.h      |  1 +
+ .../net/wireless/marvell/mwifiex/sta_cmdresp.c   | 16 ++++++++++++++++
+ 3 files changed, 31 insertions(+)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
+index b30547d1f153..347d29fd92c0 100644
+--- a/drivers/net/wireless/marvell/mwifiex/main.c
++++ b/drivers/net/wireless/marvell/mwifiex/main.c
+@@ -226,6 +226,19 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
+ 	return 0;
+ }
+ 
++static void maybe_quirk_fw_disable_ds(struct mwifiex_adapter *adapter)
++{
++	struct mwifiex_private *priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);
++	struct mwifiex_ver_ext ver_ext;
++
++	set_bit(MWIFIEX_IS_REQUESTING_FW_VEREXT, &adapter->work_flags);
++
++	memset(&ver_ext, 0, sizeof(ver_ext));
++	ver_ext.version_str_sel = 1;
++	mwifiex_send_cmd(priv, HostCmd_CMD_VERSION_EXT,
++			 HostCmd_ACT_GEN_GET, 0, &ver_ext, false);
++}
++
+ /*
+  * The main process.
+  *
+@@ -356,6 +369,7 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
+ 			if (adapter->hw_status == MWIFIEX_HW_STATUS_INIT_DONE) {
+ 				adapter->hw_status = MWIFIEX_HW_STATUS_READY;
+ 				mwifiex_init_fw_complete(adapter);
++				maybe_quirk_fw_disable_ds(adapter);
+ 			}
+ 		}
+ 
+diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
+index 90012cbcfd15..1e829d84b1f6 100644
+--- a/drivers/net/wireless/marvell/mwifiex/main.h
++++ b/drivers/net/wireless/marvell/mwifiex/main.h
+@@ -524,6 +524,7 @@ enum mwifiex_adapter_work_flags {
+ 	MWIFIEX_IS_SUSPENDED,
+ 	MWIFIEX_IS_HS_CONFIGURED,
+ 	MWIFIEX_IS_HS_ENABLING,
++	MWIFIEX_IS_REQUESTING_FW_VEREXT,
+ };
+ 
+ struct mwifiex_band_config {
+diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+index 119ccacd1fcc..fb245adba19f 100644
+--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
++++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+@@ -707,6 +707,22 @@ static int mwifiex_ret_ver_ext(struct mwifiex_private *priv,
+ {
+ 	struct host_cmd_ds_version_ext *ver_ext = &resp->params.verext;
+ 
++	if (test_and_clear_bit(MWIFIEX_IS_REQUESTING_FW_VEREXT, &priv->adapter->work_flags)) {
++		if (strncmp(ver_ext->version_str, "ChipRev:20, BB:9b(10.00), RF:40(21)", 128) == 0) {
++			struct mwifiex_ds_auto_ds auto_ds = {
++				.auto_ds = DEEP_SLEEP_OFF,
++			};
++
++			mwifiex_dbg(priv->adapter, MSG,
++				    "Bad HW revision detected, disabling deep sleep\n");
++
++			mwifiex_send_cmd(priv, HostCmd_CMD_802_11_PS_MODE_ENH,
++					 DIS_AUTO_PS, BITMAP_AUTO_DS, &auto_ds, false);
++		}
++
++		return 0;
++	}
++
+ 	if (version_ext) {
+ 		version_ext->version_str_sel = ver_ext->version_str_sel;
+ 		memcpy(version_ext->version_str, ver_ext->version_str,
+-- 
+2.31.1
+
+From 7872d72a64d4cbe46c1c811ed504a45c97ee5d6d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Wed, 11 Nov 2020 15:17:07 +0100
+Subject: [PATCH] mwifiex: Don't log error on suspend if wake-on-wlan is
+ disabled
+
+It's not an error if someone chooses to put their computer to sleep, not
+wanting it to wake up because the person next door has just discovered
+what a magic packet is. So change the loglevel of this annoying message
+from ERROR to INFO.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+index 1e1cf523e228..1cdd66c37cfc 100644
+--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
++++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+@@ -3480,7 +3480,7 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy,
+ 	}
+ 
+ 	if (!wowlan) {
+-		mwifiex_dbg(adapter, ERROR,
++		mwifiex_dbg(adapter, INFO,
+ 			    "None of the WOWLAN triggers enabled\n");
+ 		ret = 0;
+ 		goto done;
+-- 
+2.31.1
+
+From 0c087124c27767ec0cb52bc8f4a6f1400c7b6119 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Sun, 28 Mar 2021 21:42:54 +0200
+Subject: [PATCH] mwifiex: Log an error on command failure during key-material
+ upload
+
+Sometimes the KEY_MATERIAL command can fail with the 88W8897 firmware
+(when this happens exactly seems pretty random). This appears to prevent
+the access point from starting, so it seems like a good idea to log an
+error in that case.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+index 1cdd66c37cfc..6ad935c1bb47 100644
+--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
++++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+@@ -519,8 +519,14 @@ mwifiex_cfg80211_set_default_mgmt_key(struct wiphy *wiphy,
+ 	encrypt_key.is_igtk_def_key = true;
+ 	eth_broadcast_addr(encrypt_key.mac_addr);
+ 
+-	return mwifiex_send_cmd(priv, HostCmd_CMD_802_11_KEY_MATERIAL,
+-				HostCmd_ACT_GEN_SET, true, &encrypt_key, true);
++	if (mwifiex_send_cmd(priv, HostCmd_CMD_802_11_KEY_MATERIAL,
++			     HostCmd_ACT_GEN_SET, true, &encrypt_key, true)) {
++		mwifiex_dbg(priv->adapter, ERROR,
++			    "Sending KEY_MATERIAL command failed\n");
++		return -1;
++	}
++
++	return 0;
+ }
+ 
+ /*
+-- 
+2.31.1
+
+From 7f55348effced605bebc1813146c73b4c592131a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Tue, 13 Apr 2021 12:44:03 +0200
+Subject: [PATCH] mwifiex: Fix an incorrect comment
+
+We're sending DELBA requests here, not ADDBA requests.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/11n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/11n.c b/drivers/net/wireless/marvell/mwifiex/11n.c
+index 6696bce56178..b0695432b26a 100644
+--- a/drivers/net/wireless/marvell/mwifiex/11n.c
++++ b/drivers/net/wireless/marvell/mwifiex/11n.c
+@@ -125,7 +125,7 @@ int mwifiex_ret_11n_delba(struct mwifiex_private *priv,
+ 					   tx_ba_tbl->ra);
+ 	} else { /*
+ 		  * In case of failure, recreate the deleted stream in case
+-		  * we initiated the ADDBA
++		  * we initiated the DELBA
+ 		  */
+ 		if (!INITIATOR_BIT(del_ba_param_set))
+ 			return 0;
+-- 
+2.31.1
+
+From b4deeb3bb9bf7d0b56e624b1e11220a9f38ac20b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Tue, 13 Apr 2021 12:45:59 +0200
+Subject: [PATCH] mwifiex: Send DELBA requests according to spec
+
+We're currently failing to set the initiator bit for DELBA requests:
+While we set the bit on our del_ba_param_set bitmask, we forget to
+actually copy that bitmask over to the command struct, which means we
+never actually set the initiator bit.
+
+Fix that and copy the bitmask over to the host_cmd_ds_11n_delba command
+struct.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/11n.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/11n.c b/drivers/net/wireless/marvell/mwifiex/11n.c
+index b0695432b26a..9ff2058bcd7e 100644
+--- a/drivers/net/wireless/marvell/mwifiex/11n.c
++++ b/drivers/net/wireless/marvell/mwifiex/11n.c
+@@ -657,14 +657,15 @@ int mwifiex_send_delba(struct mwifiex_private *priv, int tid, u8 *peer_mac,
+ 	uint16_t del_ba_param_set;
+ 
+ 	memset(&delba, 0, sizeof(delba));
+-	delba.del_ba_param_set = cpu_to_le16(tid << DELBA_TID_POS);
+ 
+-	del_ba_param_set = le16_to_cpu(delba.del_ba_param_set);
++	del_ba_param_set = tid << DELBA_TID_POS;
++
+ 	if (initiator)
+ 		del_ba_param_set |= IEEE80211_DELBA_PARAM_INITIATOR_MASK;
+ 	else
+ 		del_ba_param_set &= ~IEEE80211_DELBA_PARAM_INITIATOR_MASK;
+ 
++	delba.del_ba_param_set = cpu_to_le16(del_ba_param_set);
+ 	memcpy(&delba.peer_mac_addr, peer_mac, ETH_ALEN);
+ 
+ 	/* We don't wait for the response of this command */
+-- 
+2.31.1
+
+From db39930e1cccb386fc4c67bea3e409c2ddb4196e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
+Date: Tue, 13 Apr 2021 12:57:41 +0200
+Subject: [PATCH] mwifiex: Ignore BTCOEX events from the firmware
+
+The firmware of the pcie 88W8897 chip sends those events very
+unreliably, which means we sometimes end up actually capping the window
+size while bluetooth is disabled, artifically limiting wifi speeds even
+though it's not needed.
+
+Since we can't fix the firmware, let's just ignore those events, it
+seems that the Windows driver also doesn't change the rx/tx block ack
+buffer sizes when bluetooth gets enabled or disabled, so this is
+consistent with the Windows driver.
+
+Patchset: wifi
+---
+ drivers/net/wireless/marvell/mwifiex/sta_event.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c
+index bc79ca4cb803..5e9e67d97857 100644
+--- a/drivers/net/wireless/marvell/mwifiex/sta_event.c
++++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c
+@@ -1056,9 +1056,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
+ 							adapter->event_skb);
+ 		break;
+ 	case EVENT_BT_COEX_WLAN_PARA_CHANGE:
+-		dev_dbg(adapter->dev, "EVENT: BT coex wlan param update\n");
+-		mwifiex_bt_coex_wlan_param_update_event(priv,
+-							adapter->event_skb);
++		dev_dbg(adapter->dev, "EVENT: ignoring BT coex wlan param update\n");
+ 		break;
+ 	case EVENT_RXBA_SYNC:
+ 		dev_dbg(adapter->dev, "EVENT: RXBA_SYNC\n");
+-- 
+2.31.1
+

patches/5.10/0003-ipts.patch

@@ -1,4 +1,4 @@
-From 9778c411a6de71c7fda3385464d24aad53666670 Mon Sep 17 00:00:00 2001
+From c9fd48a75d2dfdfe400d6e8dd6648cce8d4a29c0 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
@@ -36,7 +36,7 @@ index a7e179626b63..fdcc0eedc49f 100644
 -- 
 2.31.1
 
-From 01ead5701bdc8bd31d0b90169abbe3116b714b8f Mon Sep 17 00:00:00 2001
+From 656363e1ede653f3979f1bd04a003a57fe5d20b9 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
@@ -65,7 +65,7 @@ index bcee77768b91..21ed765003e1 100644
 -- 
 2.31.1
 
-From 0ab728b25428f3a6b4bab026c3dbde82c919a269 Mon Sep 17 00:00:00 2001
+From 7150be29706ca1c31e47d2ce5f0f3f2e6e2757c8 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

patches/5.10/0004-surface-gpe.patch

@@ -1,4 +1,4 @@
-From 7e808464b30e8197513a2540d96e0a779e254b45 Mon Sep 17 00:00:00 2001
+From d10cdce2d31a2d1568a97a323bf969b324a3f5b6 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

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

@@ -1,4 +1,4 @@
-From 3691ace591f138a288dd2efd8536e1069820e12f Mon Sep 17 00:00:00 2001
+From 4fd52eeadee06c9d6065d6cf5850f53b29db190d 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
@@ -110,7 +110,7 @@ index 37c510d9347a..aed579942436 100644
 -- 
 2.31.1
 
-From 9c7a06f67a8d79e5de4f99c73b090bfbe9921b59 Mon Sep 17 00:00:00 2001
+From 43e8f909fd2d80d4bb4583d8476c27078241f701 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

patches/5.10/0006-surface-sam.patch

@@ -1,4 +1,4 @@
-From 82f9f57a8d2911fd0b1d13b5461e1d6af7cfc889 Mon Sep 17 00:00:00 2001
+From 66bdcf71ffb02cb1f87325a11d12a340c968301e 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
@@ -99,7 +99,7 @@ index 2417dd1dee33..a6c583362b92 100644
 -- 
 2.31.1
 
-From 05a2242bbd6bb5823f3557cc7f480904e51d3d25 Mon Sep 17 00:00:00 2001
+From 387d68285ce1da37755ba55bbe3491c898dd9aee 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
@@ -3031,7 +3031,7 @@ index 000000000000..3477b31611ae
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/hid/surface-hid/surface_hid_core.c b/drivers/hid/surface-hid/surface_hid_core.c
 new file mode 100644
-index 000000000000..7b27ec392232
+index 000000000000..5571e74abe91
 --- /dev/null
 +++ b/drivers/hid/surface-hid/surface_hid_core.c
 @@ -0,0 +1,272 @@
@@ -3205,9 +3205,9 @@ index 000000000000..7b27ec392232
 +
 +	shid->hid->dev.parent = shid->dev;
 +	shid->hid->bus = BUS_HOST;
-+	shid->hid->vendor = cpu_to_le16(shid->attrs.vendor);
-+	shid->hid->product = cpu_to_le16(shid->attrs.product);
-+	shid->hid->version = cpu_to_le16(shid->hid_desc.hid_version);
++	shid->hid->vendor = get_unaligned_le16(&shid->attrs.vendor);
++	shid->hid->product = get_unaligned_le16(&shid->attrs.product);
++	shid->hid->version = get_unaligned_le16(&shid->hid_desc.hid_version);
 +	shid->hid->country = shid->hid_desc.country_code;
 +
 +	snprintf(shid->hid->name, sizeof(shid->hid->name), "Microsoft Surface %04X:%04X",
@@ -5273,7 +5273,7 @@ index 000000000000..7712baaed6a5
 +#endif /* _SURFACE_AGGREGATOR_BUS_H */
 diff --git a/drivers/platform/x86/surface_aggregator/controller.c b/drivers/platform/x86/surface_aggregator/controller.c
 new file mode 100644
-index 000000000000..aa6f37b4f46e
+index 000000000000..88ec47cae5bf
 --- /dev/null
 +++ b/drivers/platform/x86/surface_aggregator/controller.c
 @@ -0,0 +1,2579 @@
@@ -6319,7 +6319,7 @@ index 000000000000..aa6f37b4f46e
 +	union acpi_object *obj;
 +	u64 val;
 +
-+	if (!(funcs & BIT(func)))
++	if (!(funcs & BIT_ULL(func)))
 +		return 0; /* Not supported, leave *ret at its default value */
 +
 +	obj = acpi_evaluate_dsm_typed(handle, &SSAM_SSH_DSM_GUID,
@@ -16365,7 +16365,7 @@ index dd4b86318cd9..9fdd34956153 100644
 +obj-$(CONFIG_CHARGER_SURFACE)	+= surface_charger.o
 diff --git a/drivers/power/supply/surface_battery.c b/drivers/power/supply/surface_battery.c
 new file mode 100644
-index 000000000000..4116dd839ecd
+index 000000000000..7efa431a62b2
 --- /dev/null
 +++ b/drivers/power/supply/surface_battery.c
 @@ -0,0 +1,865 @@
@@ -17068,7 +17068,7 @@ index 000000000000..4116dd839ecd
 +	return count;
 +}
 +
-+DEVICE_ATTR_RW(alarm);
++static DEVICE_ATTR_RW(alarm);
 +
 +static struct attribute *spwr_battery_attrs[] = {
 +	&dev_attr_alarm.attr,
@@ -17173,7 +17173,7 @@ index 000000000000..4116dd839ecd
 +{
 +	return spwr_battery_recheck_full(dev_get_drvdata(dev));
 +}
-+SIMPLE_DEV_PM_OPS(surface_battery_pm_ops, NULL, surface_battery_resume);
++static SIMPLE_DEV_PM_OPS(surface_battery_pm_ops, NULL, surface_battery_resume);
 +
 +static int surface_battery_probe(struct ssam_device *sdev)
 +{
@@ -17236,7 +17236,7 @@ index 000000000000..4116dd839ecd
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/power/supply/surface_charger.c b/drivers/power/supply/surface_charger.c
 new file mode 100644
-index 000000000000..c2dd7e604d14
+index 000000000000..81a5b79822c9
 --- /dev/null
 +++ b/drivers/power/supply/surface_charger.c
 @@ -0,0 +1,282 @@
@@ -17468,7 +17468,7 @@ index 000000000000..c2dd7e604d14
 +{
 +	return spwr_ac_recheck(dev_get_drvdata(dev));
 +}
-+SIMPLE_DEV_PM_OPS(surface_ac_pm_ops, NULL, surface_ac_resume);
++static SIMPLE_DEV_PM_OPS(surface_ac_pm_ops, NULL, surface_ac_resume);
 +
 +static int surface_ac_probe(struct ssam_device *sdev)
 +{

patches/5.10/0007-surface-hotplug.patch

@@ -1,4 +1,4 @@
-From f35a932dd6f33aec996987f71522bc10c7735ad0 Mon Sep 17 00:00:00 2001
+From 18eb6cd9722e9b156d342afd15bfc79703040516 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
@@ -71,7 +71,7 @@ index d15c881e2e7e..b15f754e6346 100644
 -- 
 2.31.1
 
-From c1dbf999847f63bb5cd95a4399d3a0af06c47e4a Mon Sep 17 00:00:00 2001
+From 9bca9598dc233b282c6073b749a66b956f109e7f Mon Sep 17 00:00:00 2001
 From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 Date: Tue, 16 Mar 2021 16:51:40 +0100
 Subject: [PATCH] PCI: PM: Do not read power state in pci_enable_device_flags()
@@ -139,7 +139,7 @@ index 9e971fffeb6a..d5d9ea864fe6 100644
 -- 
 2.31.1
 
-From a0353eb47c250181ab006b17c39ebe8678fe612a Mon Sep 17 00:00:00 2001
+From ee233b25af7280ffb80a4bf86bcba95a954d567f 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

patches/5.10/0008-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 9070760f6bf2e6e4ee85f93b4c96441493eb5d00 Mon Sep 17 00:00:00 2001
+From a8ca320354dc7b72d22326e4b762c2b152cc98d0 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

patches/5.10/0009-surface-sensors.patch

@@ -1,4 +1,4 @@
-From b07b1740acd9a0d1f864e6c5b0c7adb0d075987d Mon Sep 17 00:00:00 2001
+From 9c5c7ffeea7c852df1ffc3d7e2b4ee21f0216a4f 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

patches/5.10/0010-cameras.patch

@@ -1,4 +1,4 @@
-From 731f713590008600e281b2b8fd91d2a1c9644710 Mon Sep 17 00:00:00 2001
+From f9c90b212cf0e5985cbe99b12a161ab37087b138 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
@@ -316,7 +316,7 @@ index 146492383aa5..7650d7998a3f 100644
 -- 
 2.31.1
 
-From 283a74f0b56e342573b3e5561e63091a952c8029 Mon Sep 17 00:00:00 2001
+From a5634dff12bbc4040de0eb790ffd92ef4d4f42f6 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
@@ -350,7 +350,7 @@ index dcbfe8c9abc7..a1f574095acc 100644
 -- 
 2.31.1
 
-From d1199ff7bbbf4a872295da89d0c0cac96477e9f7 Mon Sep 17 00:00:00 2001
+From 0493154c8ab1f32b9535f2ed31f720e0703197ed 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
@@ -409,7 +409,7 @@ index 7650d7998a3f..ccf0b85ae36f 100644
 -- 
 2.31.1
 
-From 8fae5812f737d64c53ba9cf09d4951ca8eb906d1 Mon Sep 17 00:00:00 2001
+From 8ba8f316e168b7ca2edfc7fa8522989deed6ef36 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
@@ -463,7 +463,7 @@ index 93fd25a5a3e9..b244b9de142a 100644
 -- 
 2.31.1
 
-From 6c3d043b72ae6feece18a7fb8eca32010e710d8a Mon Sep 17 00:00:00 2001
+From 0bb85cf0d6ca69105ef85068af29ca1fdd9b88e9 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
@@ -515,7 +515,7 @@ index ccf0b85ae36f..62187ab5ae43 100644
 -- 
 2.31.1
 
-From 3a9d2b39bc06fe1f5f7ed3756d6eb29173191ea8 Mon Sep 17 00:00:00 2001
+From 2b5f353ff9f2232eef01f06989071bbfe68c906a 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
@@ -560,7 +560,7 @@ index 4c43d30145c6..bc9c634df6df 100644
 -- 
 2.31.1
 
-From 38e8b9997c0ffe4425715317c18e1028904a46e4 Mon Sep 17 00:00:00 2001
+From 62c8da1fa3f1cac77ab80fe37ddd4a222f3ea047 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
@@ -604,7 +604,7 @@ index bc9c634df6df..ddba75d90af2 100644
 -- 
 2.31.1
 
-From 4ee417571605bf1d3fe05e082a68fa6536dc1db4 Mon Sep 17 00:00:00 2001
+From d7ee568e1e2b91fe5a77e11356ebb6061c60c9f0 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
@@ -707,7 +707,7 @@ index 206bd4d7d7e2..eb89bdb9232c 100644
 -- 
 2.31.1
 
-From 8a7b0a613131e1b5318a19e81cda1a47b0f5a0d2 Mon Sep 17 00:00:00 2001
+From e7693bdadc8d1b6abeba93458808d56f5f864d31 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
@@ -762,7 +762,7 @@ index eb89bdb9232c..032b24f60c78 100644
 -- 
 2.31.1
 
-From 7c5fbf8567e9569c70adf9468111c99d968ef9bb Mon Sep 17 00:00:00 2001
+From 2d75e8d54caa1a8b3e24f8df275286b4d7ebd54c 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
@@ -803,7 +803,7 @@ index 9506f8ec0974..72d36d46287d 100644
 -- 
 2.31.1
 
-From f565e3bf57877e3b8985b3355b389e8968ea6a26 Mon Sep 17 00:00:00 2001
+From 5b9b690932ca126e5b436b0acad2fbfdc0dc935f 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
@@ -971,7 +971,7 @@ index 032b24f60c78..7f056c5e0ed3 100644
 -- 
 2.31.1
 
-From 775f11c785aa1ce6f2acc99312eccd83f6ffbfba Mon Sep 17 00:00:00 2001
+From 0d120213fabfd0eabb0b82a984520eba7d035726 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
@@ -1009,7 +1009,7 @@ index 7ac87f18a10f..7d60f24240a4 100644
 -- 
 2.31.1
 
-From 64fab87139681186071e22cda102b529bb50c30d Mon Sep 17 00:00:00 2001
+From d69f864e231028b9836951a57f7821415ad7a5f3 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
@@ -1040,7 +1040,7 @@ index 24cdfcf334ea..d15fa5b4558a 100644
 -- 
 2.31.1
 
-From d1f5ac1e0b3a73a6feca5c3778f18b3a4d7b6250 Mon Sep 17 00:00:00 2001
+From b0ccfd7b70211250891206af3bbe969e0172fb97 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
@@ -1075,7 +1075,7 @@ rename to drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
 -- 
 2.31.1
 
-From 2db7943e57df3b15cb6aac98ae2cfb1e402c6c47 Mon Sep 17 00:00:00 2001
+From 763615e40b24666ccb584cd2e5482866f896de70 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
@@ -1116,7 +1116,7 @@ index e3ab003a6c85..9dd896d085ec 100644
 -- 
 2.31.1
 
-From 0ac2d404d728d2aebf84b09265565e212444184e Mon Sep 17 00:00:00 2001
+From 6825e66d665c20e130a7f3961158a95e12355b3e 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
@@ -1225,7 +1225,7 @@ index 37dac195adbb..f28b097c658f 100644
 -- 
 2.31.1
 
-From 5e28f3baabb8aec62ef9d3d8fa5cf8c6fdef0fc6 Mon Sep 17 00:00:00 2001
+From b2b9a73febf2e698de4a9d9639284324d8e0bd61 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
@@ -1302,7 +1302,7 @@ index ed0840f3d5df..6ca337c28b3c 100644
 -- 
 2.31.1
 
-From c0242c03cb0271da8dabf6e179b1639ef4da505a Mon Sep 17 00:00:00 2001
+From 5397ff5b253b915f959cd0555018d67d0a95392f 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
@@ -1900,7 +1900,7 @@ index 62187ab5ae43..dc3e343a37fb 100644
 -- 
 2.31.1
 
-From 411ec14f5efce480507ddb2895c911445125e66e Mon Sep 17 00:00:00 2001
+From 275e7e60a864cb37a19cd055ceb8d212710d673b 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
@@ -2002,7 +2002,7 @@ index ddca1550cce6..78b38775f18b 100644
 -- 
 2.31.1
 
-From 34568292f746b98d520d5e831b958432661ea9a7 Mon Sep 17 00:00:00 2001
+From 237d43d7e76165c505f474d876054cad3e9f6ce0 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
@@ -2088,7 +2088,7 @@ index f28b097c658f..9bec3373f850 100644
 -- 
 2.31.1
 
-From 316c236ed0af900b421d5c3afab6526d82e606c3 Mon Sep 17 00:00:00 2001
+From 40449ec59cc082cb14008bbbcc95f99813bf48b7 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()
@@ -2110,10 +2110,10 @@ Patchset: cameras
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
-index 573b5da145d1..e8d3e268895e 100644
+index c13e7f107dd3..2ca4697c2339 100644
 --- a/drivers/i2c/i2c-core-base.c
 +++ b/drivers/i2c/i2c-core-base.c
-@@ -809,12 +809,12 @@ static void i2c_dev_set_name(struct i2c_adapter *adap,
+@@ -810,12 +810,12 @@ static void i2c_dev_set_name(struct i2c_adapter *adap,
  	struct acpi_device *adev = ACPI_COMPANION(&client->dev);
  
  	if (info && info->dev_name) {
@@ -2156,7 +2156,7 @@ index 56622658b215..65acae61dc5c 100644
 -- 
 2.31.1
 
-From 5d26b5d31cf617080de88f7257688b74ad3767e5 Mon Sep 17 00:00:00 2001
+From 150ab56a8dda93fc339492670726a4aabd0c7b4a 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()
@@ -2214,7 +2214,7 @@ index 65acae61dc5c..b82aac05b17f 100644
 -- 
 2.31.1
 
-From ff8d5bfb94b837c9d653ee8814fa8ef06346006d Mon Sep 17 00:00:00 2001
+From 89c3c55c3de64679613d216b220863eb857818ed 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()
@@ -2278,7 +2278,7 @@ index fdb1d5262ce8..817f53506cfe 100644
 -- 
 2.31.1
 
-From a040e9ff97b897727bc23097b13fdf9c734a2873 Mon Sep 17 00:00:00 2001
+From eb811338db5c5ede84bdb257e3d825efbcbca10d 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
@@ -2469,7 +2469,7 @@ index 4a4df4ffd18c..000000000000
 -- 
 2.31.1
 
-From a82640ba8452e08f6db879b0216f41ac1781060a Mon Sep 17 00:00:00 2001
+From 8471f2b7815b7d7b7536e094976e85c29faac3a4 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
@@ -3438,7 +3438,7 @@ index 000000000000..3fe27ec0caff
 -- 
 2.31.1
 
-From bd4c292cf29860371dde8b4956f093a5d0ae309a Mon Sep 17 00:00:00 2001
+From a0bfbf354dfd1f46811877adaa5dbb040fda943f 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
@@ -3508,7 +3508,7 @@ index 745a4e0c4994..87e45a800919 100644
 -- 
 2.31.1
 
-From bde831e2b45ee917ccabafec5eac5d95f53166a3 Mon Sep 17 00:00:00 2001
+From 0dee3173cb9104e1e931486ebafb9aca642d6029 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
@@ -6865,7 +6865,7 @@ index 000000000000..9a508e1f3624
 -- 
 2.31.1
 
-From ba6db87eac185cf9d85ccc592f2d546da4426b18 Mon Sep 17 00:00:00 2001
+From 371df992de0a05be49c613a0e70e66e1e88968cc 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
@@ -6906,7 +6906,7 @@ index 32485e4ed42b..f9ced52ad37a 100644
 -- 
 2.31.1
 
-From 5e82d41bff01e59675dbad9583f5e6a085b7d920 Mon Sep 17 00:00:00 2001
+From 8f0aa84176c6aa18b9e6bb0572f9d52f23b61cbd 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
@@ -6935,7 +6935,7 @@ index f9ced52ad37a..9fd44a3d1d85 100644
 -- 
 2.31.1
 
-From 62abafecdd309d9047f5d2b8f812a33e962dcabd Mon Sep 17 00:00:00 2001
+From 168d2f955f48834eadde843287c19bacc82bc2ab 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
@@ -7098,7 +7098,7 @@ index dd0ffcafa489..924d99d20328 100644
 -- 
 2.31.1
 
-From de8d9501fc829d4bac3df84ef6ab1a30f3ee9bf5 Mon Sep 17 00:00:00 2001
+From 88cd27f1b6344ad42e353ce637c4559779b32a67 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
@@ -7154,7 +7154,7 @@ index 9fd44a3d1d85..1a85800df7ed 100644
 -- 
 2.31.1
 
-From b1cb964d3551ed0d82dd2669a776b332f1607b7c Mon Sep 17 00:00:00 2001
+From 08e4888ecf7996ce02eb3794d5e99d88bd17b822 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
@@ -7571,7 +7571,7 @@ index 3fe27ec0caff..40629291b339 100644
 -- 
 2.31.1
 
-From 1db7c626fb59437e8d97bc88090c70a084eda842 Mon Sep 17 00:00:00 2001
+From 7271e1e7409b37368fba42f1274f37995af82bcc 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
@@ -7698,7 +7698,7 @@ index 42ae8396eb64..98eb1ec3399e 100644
 -- 
 2.31.1
 
-From 972611cd074d9212d0a7192ad35f49cc1c50958b Mon Sep 17 00:00:00 2001
+From da6fbed8b62538a72da8c7a0e6d3bb490c965365 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
@@ -7802,7 +7802,7 @@ index 924d99d20328..e1e388cc9f45 100644
 -- 
 2.31.1
 
-From bb94bbde5b38acbdae5e805a993e829633d03fe6 Mon Sep 17 00:00:00 2001
+From 044cae04d836b4c357bbac423bb09f21fbd47729 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()
@@ -7924,7 +7924,7 @@ index 9a508e1f3624..26819cf3f4d2 100644
 -- 
 2.31.1
 
-From 0bd98a9fa71d7394221080699ee884f77b0df0fa Mon Sep 17 00:00:00 2001
+From 8efba0c0de8f0ac3f32794f2d24063aeec42c6ba 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
@@ -7962,7 +7962,7 @@ index a9747ab783d7..7fb368eec327 100644
 -- 
 2.31.1
 
-From 940203441ab7a2cad4f71036ca05d0f57752f262 Mon Sep 17 00:00:00 2001
+From 3ee39d71ebbe83b11bcb391f8780b0bbce986a76 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
@@ -8038,7 +8038,7 @@ index 26819cf3f4d2..9d7eed97963b 100644
 -- 
 2.31.1
 
-From fbef1037a0362ab18ec6ec1fde734cfc5d293330 Mon Sep 17 00:00:00 2001
+From b5c7cc5bd5a781b2ac85bdf118ef072d21f79413 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
@@ -8113,7 +8113,7 @@ index 1950d7ac2d54..cea767230aa9 100644
 -- 
 2.31.1
 
-From b4aea416d729aa1fa7a20c13f48914c7ce736918 Mon Sep 17 00:00:00 2001
+From 105af6012010e90bb9a95eea63bd1bc81715fd21 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
@@ -8149,7 +8149,7 @@ index cea767230aa9..f681dbfcec56 100644
 -- 
 2.31.1
 
-From 97d935041695ee1643d7c7ac8088b3ab6f364979 Mon Sep 17 00:00:00 2001
+From 47e10422e81dee2de65cf4662a52a0c135cfc3d3 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
@@ -8299,7 +8299,7 @@ index 9d7eed97963b..965208078c2b 100644
 -- 
 2.31.1
 
-From b2a1b374ab1736ddb76e86d0bdc6fec3b731ebc1 Mon Sep 17 00:00:00 2001
+From 825aadd991b07b4e6368268a063565cada5decb3 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
@@ -8371,7 +8371,7 @@ index f681dbfcec56..51eb3b05d121 100644
 -- 
 2.31.1
 
-From b1b9d036d33f23486a5588489ee21c23985f34b5 Mon Sep 17 00:00:00 2001
+From e01b0da89e8503a688fcb11b557c3d25b252a688 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
@@ -8434,7 +8434,7 @@ index 51eb3b05d121..952558c4f33b 100644
 -- 
 2.31.1
 
-From d6e451e5e88a78be477bb723f57b99076c4de6ec Mon Sep 17 00:00:00 2001
+From 4e0d16e8507e5680225b329e67bcd69000403a62 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
@@ -8469,7 +8469,7 @@ index 952558c4f33b..dd31083eeb7b 100644
 -- 
 2.31.1
 
-From 29420c3a4405a442ea4776e785c61e2d73efbd77 Mon Sep 17 00:00:00 2001
+From dfeff845a96be3795b8fedeabfd9c635cc988323 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
@@ -8508,7 +8508,7 @@ index 965208078c2b..7f1d31a82d3d 100644
 -- 
 2.31.1
 
-From bd0c88cb7a4d601eee5cc0b8095a32b6282a2456 Mon Sep 17 00:00:00 2001
+From 6a0f9c7a066017530f15ac63777bbb5f20383b08 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
@@ -9429,7 +9429,7 @@ index 7f1d31a82d3d..70ccb3aae4c7 100644
 -- 
 2.31.1
 
-From 26c255f3f853a66a187e3c00c6f4098a0bfea177 Mon Sep 17 00:00:00 2001
+From 6e8ea0a48fbc00fd314892e28b46323eb2e732e1 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
@@ -9774,7 +9774,7 @@ index 70ccb3aae4c7..b78d3b474a43 100644
 -- 
 2.31.1
 
-From 35647043a847a9b9360439fc64f1808964560e9e Mon Sep 17 00:00:00 2001
+From c7e6e2f99ac28e65308633bbe63847b078c7383e 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
@@ -9945,7 +9945,7 @@ index f2eaa5f71a31..ce26ce86fbd5 100644
 -- 
 2.31.1
 
-From 7f5b20a17bdcc97aa3b4f0687f5791141618463f Mon Sep 17 00:00:00 2001
+From 929b4cb806e4d50dae5de3539e634b6123494e34 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
@@ -9986,7 +9986,7 @@ index ce26ce86fbd5..b3b391a49fdb 100644
 -- 
 2.31.1
 
-From e6423436a57d7aa0ce2b02dc006020f67c0dac1f Mon Sep 17 00:00:00 2001
+From dd94f4d2cad947350135325e5e6c992deb4fbbaf 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
@@ -10405,7 +10405,7 @@ index b3b391a49fdb..2c82b6578de9 100644
 -- 
 2.31.1
 
-From 35978e5a07f94a85768c758b600df3ccb2f56972 Mon Sep 17 00:00:00 2001
+From 0df7a896c184f8a394bfadfcb5accec54e8e984b 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
@@ -10561,7 +10561,7 @@ index 2c82b6578de9..313bc9177328 100644
 -- 
 2.31.1
 
-From a9d5f94226e4db4774a8e8b4c4b90236cdd7a5d6 Mon Sep 17 00:00:00 2001
+From cdcee79dbade1fed8a710698a7715155bdc908f2 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
@@ -10707,7 +10707,7 @@ index b78d3b474a43..6502777eb5f3 100644
 -- 
 2.31.1
 
-From 72a0420987538dfdf93fce535dc39193cf16c3b7 Mon Sep 17 00:00:00 2001
+From fc2aa1041a36732eaa3dfabf778dba05d0a969b4 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
@@ -10737,7 +10737,7 @@ index 313bc9177328..d092ed698eb3 100644
 -- 
 2.31.1
 
-From c918149bad45586338069a966402f29ba61a855c Mon Sep 17 00:00:00 2001
+From d57ea9dba5be6b6ff07c9a2f429c7f7bb7a1b432 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
@@ -10794,7 +10794,7 @@ index 6502777eb5f3..0dfbbe9a0ff2 100644
 -- 
 2.31.1
 
-From 0364fdf73b0778bbcbe70aac532c71525e50d7ff Mon Sep 17 00:00:00 2001
+From 2c25871bda2c588b60967dca041756780de92b6e 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
@@ -10868,7 +10868,7 @@ index 8082d37841da..c580159079d2 100644
 -- 
 2.31.1
 
-From 77ffe5e3955079e130fdff49f74dca449f7cdb9e Mon Sep 17 00:00:00 2001
+From 61d156e49134b769df86dbac44a0adf2646d0dc7 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
@@ -10911,7 +10911,7 @@ index c580159079d2..9f61b470f8ba 100644
 -- 
 2.31.1
 
-From 5dd43ebf1285314c968e2d993cfb912465065a7e Mon Sep 17 00:00:00 2001
+From c0431a07e0e61e732f1cf6208c765c3e017ba475 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
@@ -10990,7 +10990,7 @@ index 9f61b470f8ba..622a7ddf4063 100644
 -- 
 2.31.1
 
-From acfda7e32b173a67d26bb994d659f0b9aee24931 Mon Sep 17 00:00:00 2001
+From 1165ace46877c811a765c543c92e4f497ec20da7 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
@@ -11419,7 +11419,7 @@ index 0dfbbe9a0ff2..29e6735112da 100644
 -- 
 2.31.1
 
-From e59f330a2bd2d56dd58b9634f7842e7412a64b5f Mon Sep 17 00:00:00 2001
+From d4e59b4a8b41395b1bde9562871bca82b2e06333 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

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

@@ -1,4 +1,4 @@
-From 7f787165a7d464d64c6873d6976382701f6d8090 Mon Sep 17 00:00:00 2001
+From 2caecf6882a562d8fd57fe9eda4c4b5024e9125a 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