Selaa lähdekoodia

Update v5.10 patches

Changes:
 - Various small fixes.

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/452ca809c380db3e974530e2b362d25b6214efde
 - SAM: https://github.com/linux-surface/surface-aggregator-module/commit/e73516d1d21fb9fe2956b770d73bdf2490001938
 - GPE: https://github.com/linux-surface/surface-gpe/commit/6ecfdb39050129bf17e5f1fff784e4df7aa56171
Maximilian Luz 4 vuotta sitten
vanhempi
commit
102b9aeb9d

+ 1 - 1
patches/5.10/0001-surface3-oemb.patch

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

+ 11 - 11
patches/5.10/0002-wifi.patch

@@ -1,4 +1,4 @@
-From 39d2c5e1c887077827f649d109752eeaa28527a5 Mon Sep 17 00:00:00 2001
+From 87009a45b3fb8bd697cca306828bb7bc7f6d80d5 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
@@ -156,7 +156,7 @@ index 843d57eda820..5ed613d65709 100644
 -- 
 2.30.0
 
-From e9a27cae06a35ea4002b09b1167eb364960c981a Mon Sep 17 00:00:00 2001
+From ea4297c1c464ab216c09d25c2f1af292c228b18e 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
@@ -364,7 +364,7 @@ index 000000000000..5326ae7e5671
 -- 
 2.30.0
 
-From 2b58ea6c81e51f4a15c0b7a05989e9dda337eb99 Mon Sep 17 00:00:00 2001
+From f36f5936f9fbca30a9e9ef785015186bca8ee006 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+
@@ -565,7 +565,7 @@ index 5326ae7e5671..8b9dcb5070d8 100644
 -- 
 2.30.0
 
-From 4142e90c5cd714143ffdb9c08a320a1ef22c55d3 Mon Sep 17 00:00:00 2001
+From c8cbe2b6d4c0b8d5a6d30f6e4cab17390adf5b77 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
@@ -744,7 +744,7 @@ index 8b9dcb5070d8..3ef7440418e3 100644
 -- 
 2.30.0
 
-From 4637841d71f25095324ad60498e9eeb29ba92d29 Mon Sep 17 00:00:00 2001
+From 970c5d56583d2a940706580cea083a14431d7aa0 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
@@ -806,7 +806,7 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
 -- 
 2.30.0
 
-From da10f76e231ecb18388407124cbcd58ad3ab86f4 Mon Sep 17 00:00:00 2001
+From 30ac4d3ad1f5f70e9cf12e249d8f78d680359fe0 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
@@ -948,7 +948,7 @@ index 94561ddaf126..7b25335f1df3 100644
 -- 
 2.30.0
 
-From ccc1020fc5f4aa56b1763da035871ac9ec48b9ff Mon Sep 17 00:00:00 2001
+From 0e150dd486af10093035f0cc54a1e3a67cf11b65 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
@@ -997,7 +997,7 @@ index 7b25335f1df3..f7e0b86eb553 100644
 -- 
 2.30.0
 
-From 0f44b4dbcc1d5c6122ce47e6f94ba6b8363224f5 Mon Sep 17 00:00:00 2001
+From a17560e923a7e1e8928e051bf2edecdf5d4dafc5 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+
@@ -1152,7 +1152,7 @@ index 3ef7440418e3..a95ebac06e13 100644
 -- 
 2.30.0
 
-From 0cc23f105337652dfc4d6b0dd2e974d9b0ea1cdd Mon Sep 17 00:00:00 2001
+From e1b592170064cb85d811337b40ad0f30ec7526f8 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
@@ -1214,7 +1214,7 @@ index a6b9dc6700b1..943bc1e8ceae 100644
 -- 
 2.30.0
 
-From ccfea0061e6e0a50c7ba04f2abcbb7bfdff26149 Mon Sep 17 00:00:00 2001
+From cad3b0ba3e206ec40d3f425da7f7308d2f43556b 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
@@ -1249,7 +1249,7 @@ index 943bc1e8ceae..a2eb8df8d385 100644
 -- 
 2.30.0
 
-From 1c34a9a4c8753c3733610958a1223dabe8261341 Mon Sep 17 00:00:00 2001
+From dfa6f63ee590f00a02c0cf7fbb899a573f034ed0 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

+ 3 - 3
patches/5.10/0003-ipts.patch

@@ -1,4 +1,4 @@
-From 34d0c125af0c663dbdfe7c62367fffee6db87583 Mon Sep 17 00:00:00 2001
+From ea5fed3f7755a0753d74233fed09257e2f0d3ba7 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Fri, 25 Sep 2020 18:06:05 +0200
 Subject: [PATCH] mei: Remove client devices before shutting down
@@ -27,7 +27,7 @@ index bcee77768b91..21ed765003e1 100644
 -- 
 2.30.0
 
-From a2062572ad3b310af83837a32c3f66899dd30fa6 Mon Sep 17 00:00:00 2001
+From 2b77466eb637e9418cb661b61e3c18de800c3c6f 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
@@ -65,7 +65,7 @@ index 1de9ef7a272b..e12484840f88 100644
 -- 
 2.30.0
 
-From 68738ad77a09b736b5d3de8fb51e33a0d14c1e2d Mon Sep 17 00:00:00 2001
+From 99cb44358ee4d8ed8be3f1e01963a5e264e010c9 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

+ 6 - 6
patches/5.10/0004-surface-gpe.patch

@@ -1,4 +1,4 @@
-From f2073e529d07e7ea58a616410c02072cd159b6ec Mon Sep 17 00:00:00 2001
+From c15d0471a2ab876031795b0002666e2d774a27bb 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
@@ -71,7 +71,7 @@ index 5f823f7eff45..c0d1c753eb3c 100644
  obj-$(CONFIG_MSI_LAPTOP)	+= msi-laptop.o
 diff --git a/drivers/platform/x86/surface_gpe.c b/drivers/platform/x86/surface_gpe.c
 new file mode 100644
-index 000000000000..573dc52f568f
+index 000000000000..86f6991b1215
 --- /dev/null
 +++ b/drivers/platform/x86/surface_gpe.c
 @@ -0,0 +1,321 @@
@@ -215,7 +215,7 @@ index 000000000000..573dc52f568f
 +		.ident = "Surface Laptop 3 (Intel 13\")",
 +		.matches = {
 +			/*
-+			 * We match for SKU here due to different vairants: The
++			 * We match for SKU here due to different variants: The
 +			 * AMD (15") version does not rely on GPEs.
 +			 */
 +			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
@@ -227,7 +227,7 @@ index 000000000000..573dc52f568f
 +		.ident = "Surface Laptop 3 (Intel 15\")",
 +		.matches = {
 +			/*
-+			 * We match for SKU here due to different vairants: The
++			 * We match for SKU here due to different variants: The
 +			 * AMD (15") version does not rely on GPEs.
 +			 */
 +			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
@@ -258,12 +258,12 @@ index 000000000000..573dc52f568f
 +	return 0;
 +}
 +
-+static int surface_gpe_suspend(struct device *dev)
++static int __maybe_unused surface_gpe_suspend(struct device *dev)
 +{
 +	return surface_lid_enable_wakeup(dev, true);
 +}
 +
-+static int surface_gpe_resume(struct device *dev)
++static int __maybe_unused surface_gpe_resume(struct device *dev)
 +{
 +	return surface_lid_enable_wakeup(dev, false);
 +}

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

@@ -1,4 +1,4 @@
-From f91e07d1c00ec9df538b6b05c7dd6c37c47ee861 Mon Sep 17 00:00:00 2001
+From d46cbd24104243e4e7c4c01d28ed503fab46c8ea 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.30.0
 
-From 7588685af02166f69efdc1baf76714543f1fdd53 Mon Sep 17 00:00:00 2001
+From ebd07cf190014ef57f7bc9f179cb92c2bcd54d90 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

+ 68 - 36
patches/5.10/0006-surface-sam.patch

@@ -1,4 +1,4 @@
-From de0fd5d6159a2e3062d2513e10f663f103727ebf Mon Sep 17 00:00:00 2001
+From 248862ab189d99edec0f98b5bb546c7311b435bb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 17 Aug 2020 01:23:20 +0200
 Subject: [PATCH] misc: surface_sam: Add file2alias support for Surface SAM
@@ -100,7 +100,7 @@ index 2417dd1dee33..a6c583362b92 100644
 -- 
 2.30.0
 
-From 6cff8daf1363e6abf97b5b9bbfcf4b2d2dd7eea5 Mon Sep 17 00:00:00 2001
+From c510e853cb20d7a1936322825993da0788b6e96e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 17 Aug 2020 01:44:30 +0200
 Subject: [PATCH] misc: Add support for Surface System Aggregator Module
@@ -133,26 +133,26 @@ Patchset: surface-sam
  drivers/misc/Makefile                         |    1 +
  drivers/misc/surface_aggregator/Kconfig       |   67 +
  drivers/misc/surface_aggregator/Makefile      |   18 +
- drivers/misc/surface_aggregator/bus.c         |  416 +++
+ drivers/misc/surface_aggregator/bus.c         |  415 +++
  drivers/misc/surface_aggregator/bus.h         |   27 +
  .../misc/surface_aggregator/clients/Kconfig   |  134 +
  .../misc/surface_aggregator/clients/Makefile  |   10 +
  .../clients/surface_acpi_notify.c             |  886 ++++++
- .../clients/surface_aggregator_cdev.c         |  303 ++
- .../clients/surface_aggregator_registry.c     |  665 +++++
+ .../clients/surface_aggregator_cdev.c         |  322 ++
+ .../clients/surface_aggregator_registry.c     |  664 +++++
  .../clients/surface_battery.c                 | 1168 ++++++++
  .../surface_aggregator/clients/surface_dtx.c  | 1277 ++++++++
  .../surface_aggregator/clients/surface_hid.c  |  924 ++++++
  .../clients/surface_perfmode.c                |  122 +
  drivers/misc/surface_aggregator/controller.c  | 2579 +++++++++++++++++
  drivers/misc/surface_aggregator/controller.h  |  285 ++
- drivers/misc/surface_aggregator/core.c        |  840 ++++++
+ drivers/misc/surface_aggregator/core.c        |  839 ++++++
  drivers/misc/surface_aggregator/ssh_msgb.h    |  205 ++
- .../surface_aggregator/ssh_packet_layer.c     | 2057 +++++++++++++
+ .../surface_aggregator/ssh_packet_layer.c     | 2074 +++++++++++++
  .../surface_aggregator/ssh_packet_layer.h     |  190 ++
  drivers/misc/surface_aggregator/ssh_parser.c  |  228 ++
  drivers/misc/surface_aggregator/ssh_parser.h  |  155 +
- .../surface_aggregator/ssh_request_layer.c    | 1264 ++++++++
+ .../surface_aggregator/ssh_request_layer.c    | 1263 ++++++++
  .../surface_aggregator/ssh_request_layer.h    |  143 +
  drivers/misc/surface_aggregator/trace.h       |  632 ++++
  include/linux/mod_devicetable.h               |    5 +-
@@ -164,7 +164,7 @@ Patchset: surface-sam
  include/uapi/linux/surface_aggregator/dtx.h   |  146 +
  scripts/mod/devicetable-offsets.c             |    3 +-
  scripts/mod/file2alias.c                      |   10 +-
- 47 files changed, 19173 insertions(+), 7 deletions(-)
+ 47 files changed, 19205 insertions(+), 7 deletions(-)
  create mode 100644 Documentation/driver-api/surface_aggregator/client-api.rst
  create mode 100644 Documentation/driver-api/surface_aggregator/client.rst
  create mode 100644 Documentation/driver-api/surface_aggregator/clients/cdev.rst
@@ -2786,10 +2786,10 @@ index 000000000000..b48ffc37ab52
 +endif
 diff --git a/drivers/misc/surface_aggregator/bus.c b/drivers/misc/surface_aggregator/bus.c
 new file mode 100644
-index 000000000000..fecfa1b6a140
+index 000000000000..a9b660af0917
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/bus.c
-@@ -0,0 +1,416 @@
+@@ -0,0 +1,415 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Surface System Aggregator Module bus and device integration.
@@ -2811,8 +2811,7 @@ index 000000000000..fecfa1b6a140
 +{
 +	struct ssam_device *sdev = to_ssam_device(dev);
 +
-+	// FIXME: we should use sysfs_emit here, but that's not available on < 5.10
-+	return scnprintf(buf, PAGE_SIZE, "ssam:d%02Xc%02Xt%02Xi%02Xf%02X\n",
++	return sysfs_emit(buf, "ssam:d%02Xc%02Xt%02Xi%02Xf%02X\n",
 +			sdev->uid.domain, sdev->uid.category, sdev->uid.target,
 +			sdev->uid.instance, sdev->uid.function);
 +}
@@ -3397,7 +3396,7 @@ index 000000000000..4249af06d738
 +obj-$(CONFIG_SURFACE_PERFMODE) 			+= surface_perfmode.o
 diff --git a/drivers/misc/surface_aggregator/clients/surface_acpi_notify.c b/drivers/misc/surface_aggregator/clients/surface_acpi_notify.c
 new file mode 100644
-index 000000000000..8cd67a669c86
+index 000000000000..ef9c1f8e8336
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/clients/surface_acpi_notify.c
 @@ -0,0 +1,886 @@
@@ -3591,7 +3590,7 @@ index 000000000000..8cd67a669c86
 +	union acpi_object *obj;
 +	int status = 0;
 +
-+	if (!acpi_check_dsm(san, &SAN_DSM_UUID, SAN_DSM_REVISION, 1 << func))
++	if (!acpi_check_dsm(san, &SAN_DSM_UUID, SAN_DSM_REVISION, BIT_ULL(func)))
 +		return 0;
 +
 +	dev_dbg(dev, "notify event %#04llx\n", func);
@@ -4289,10 +4288,10 @@ index 000000000000..8cd67a669c86
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/misc/surface_aggregator/clients/surface_aggregator_cdev.c b/drivers/misc/surface_aggregator/clients/surface_aggregator_cdev.c
 new file mode 100644
-index 000000000000..340d15b148b9
+index 000000000000..79e28fab7e40
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/clients/surface_aggregator_cdev.c
-@@ -0,0 +1,303 @@
+@@ -0,0 +1,322 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Provides user-space access to the SSAM EC via the /dev/surface/aggregator
@@ -4361,8 +4360,8 @@ index 000000000000..340d15b148b9
 +{
 +	struct ssam_cdev_request __user *r;
 +	struct ssam_cdev_request rqst;
-+	struct ssam_request spec;
-+	struct ssam_response rsp;
++	struct ssam_request spec = {};
++	struct ssam_response rsp = {};
 +	const void __user *plddata;
 +	void __user *rspdata;
 +	int status = 0, ret = 0, tmp;
@@ -4401,6 +4400,15 @@ index 000000000000..340d15b148b9
 +			goto out;
 +		}
 +
++		/*
++		 * Note: spec.length is limited to U16_MAX bytes via struct
++		 * ssam_cdev_request. This is slightly larger than the
++		 * theoretical maximum (SSH_COMMAND_MAX_PAYLOAD_SIZE) of the
++		 * underlying protocol (note that nothing remotely this size
++		 * should ever be allocated in any normal case). This size is
++		 * validated later in ssam_request_sync(), for allocation the
++		 * bound imposed by u16 should be enough.
++		 */
 +		spec.payload = kzalloc(spec.length, GFP_KERNEL);
 +		if (!spec.payload) {
 +			ret = -ENOMEM;
@@ -4420,6 +4428,16 @@ index 000000000000..340d15b148b9
 +			goto out;
 +		}
 +
++		/*
++		 * Note: rsp.capacity is limited to U16_MAX bytes via struct
++		 * ssam_cdev_request. This is slightly larger than the
++		 * theoretical maximum (SSH_COMMAND_MAX_PAYLOAD_SIZE) of the
++		 * underlying protocol (note that nothing remotely this size
++		 * should ever be allocated in any normal case). In later use,
++		 * this capacity does not have to be strictly bounded, as it
++		 * is only used as an output buffer to be written to. For
++		 * allocation the bound imposed by u16 should be enough.
++		 */
 +		rsp.pointer = kzalloc(rsp.capacity, GFP_KERNEL);
 +		if (!rsp.pointer) {
 +			ret = -ENOMEM;
@@ -4598,10 +4616,10 @@ index 000000000000..340d15b148b9
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/misc/surface_aggregator/clients/surface_aggregator_registry.c b/drivers/misc/surface_aggregator/clients/surface_aggregator_registry.c
 new file mode 100644
-index 000000000000..b58930751404
+index 000000000000..8b4f0b3c1f31
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/clients/surface_aggregator_registry.c
-@@ -0,0 +1,665 @@
+@@ -0,0 +1,664 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Surface System Aggregator Module (SSAM) client device registry.
@@ -4954,8 +4972,7 @@ index 000000000000..b58930751404
 +	connected = hub->state == SSAM_BASE_HUB_CONNECTED;
 +	mutex_unlock(&hub->lock);
 +
-+	// FIXME: we should use sysfs_emit here, but that's not available on < 5.10
-+	return scnprintf(buf, PAGE_SIZE, "%d\n", connected);
++	return sysfs_emit(buf, "%d\n", connected);
 +}
 +
 +static struct device_attribute ssam_base_hub_attr_state =
@@ -11660,10 +11677,10 @@ index 000000000000..8297d34e7489
 +#endif /* _SURFACE_AGGREGATOR_CONTROLLER_H */
 diff --git a/drivers/misc/surface_aggregator/core.c b/drivers/misc/surface_aggregator/core.c
 new file mode 100644
-index 000000000000..b3e585484bc5
+index 000000000000..8dc2c267bcd6
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/core.c
-@@ -0,0 +1,840 @@
+@@ -0,0 +1,839 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Surface Serial Hub (SSH) driver for communication with the Surface/System
@@ -11946,8 +11963,7 @@ index 000000000000..b3e585484bc5
 +	b = ((version >> 8) & 0xffff);
 +	c = version & 0xff;
 +
-+	// FIXME: we should use sysfs_emit here, but that's not available on < 5.10
-+	return scnprintf(buf, PAGE_SIZE, "%u.%u.%u\n", a, b, c);
++	return sysfs_emit(buf, "%u.%u.%u\n", a, b, c);
 +}
 +static DEVICE_ATTR_RO(firmware_version);
 +
@@ -12717,10 +12733,10 @@ index 000000000000..1221f642dda1
 +#endif /* _SURFACE_AGGREGATOR_SSH_MSGB_H */
 diff --git a/drivers/misc/surface_aggregator/ssh_packet_layer.c b/drivers/misc/surface_aggregator/ssh_packet_layer.c
 new file mode 100644
-index 000000000000..74f0faaa2b27
+index 000000000000..583315db8b02
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/ssh_packet_layer.c
-@@ -0,0 +1,2057 @@
+@@ -0,0 +1,2074 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * SSH packet transport layer.
@@ -14417,7 +14433,24 @@ index 000000000000..74f0faaa2b27
 +	/* Find SYN. */
 +	syn_found = sshp_find_syn(source, &aligned);
 +
-+	if (unlikely(aligned.ptr - source->ptr) > 0) {
++	if (unlikely(aligned.ptr != source->ptr)) {
++		/*
++		 * We expect aligned.ptr == source->ptr. If this is not the
++		 * case, then aligned.ptr > source->ptr and we've encountered
++		 * some unexpected data where we'd expect the start of a new
++		 * message (i.e. the SYN sequence).
++		 *
++		 * This can happen when a CRC check for the previous message
++		 * failed and we start actively searching for the next one
++		 * (via the call to sshp_find_syn() above), or the first bytes
++		 * of a message got dropped or corrupted.
++		 *
++		 * In any case, we issue a warning, send a NAK to the EC to
++		 * request re-transmission of any data we haven't acknowledged
++		 * yet, and finally, skip everything up to the next SYN
++		 * sequence.
++		 */
++
 +		ptl_warn(ptl, "rx: parser: invalid start of frame, skipping\n");
 +
 +		/*
@@ -15371,10 +15404,10 @@ index 000000000000..395c61ef890b
 +#endif /* _SURFACE_AGGREGATOR_SSH_PARSER_h */
 diff --git a/drivers/misc/surface_aggregator/ssh_request_layer.c b/drivers/misc/surface_aggregator/ssh_request_layer.c
 new file mode 100644
-index 000000000000..bb1c862411a2
+index 000000000000..52a83a8fcf82
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/ssh_request_layer.c
-@@ -0,0 +1,1264 @@
+@@ -0,0 +1,1263 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * SSH request transport layer.
@@ -16381,9 +16414,8 @@ index 000000000000..bb1c862411a2
 + *
 + * Initializes the given request transport layer and associated packet
 + * transport layer. Transmitter and receiver threads must be started
-+ * separately via ssh_rtl_tx_start() and ssh_rtl_rx_start(), after the
-+ * request-layer has been initialized and the lower-level serial device layer
-+ * has been set up.
++ * separately via ssh_rtl_start(), after the request-layer has been
++ * initialized and the lower-level serial device layer has been set up.
 + *
 + * Return: Returns zero on success and a nonzero error code on failure.
 + */
@@ -16433,7 +16465,7 @@ index 000000000000..bb1c862411a2
 +}
 +
 +/**
-+ * ssh_rtl_tx_start() - Start request transmitter and receiver.
++ * ssh_rtl_start() - Start request transmitter and receiver.
 + * @rtl: The request transport layer.
 + *
 + * Return: Returns zero on success, a negative error code on failure.

+ 3 - 3
patches/5.10/0007-surface-hotplug.patch

@@ -1,4 +1,4 @@
-From 6fdcf2b35d7e7f046fdd97e72f8dbf5b32b5fba4 Mon Sep 17 00:00:00 2001
+From 57ef85688b82ee9f409b65c6fb065b6a529aef12 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
@@ -58,7 +58,7 @@ index 6427cbd0a5be..3200afed2604 100644
 -- 
 2.30.0
 
-From 689ce34b5d9c08c831013a38360ed0a0652066d9 Mon Sep 17 00:00:00 2001
+From 249b96f567db1adb80007428177141f6aec5c61f 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
@@ -131,7 +131,7 @@ index d15c881e2e7e..b15f754e6346 100644
 -- 
 2.30.0
 
-From 20dff2129622924eb97d9e4e1719abfb95339dcd Mon Sep 17 00:00:00 2001
+From de32407f6bf024ae5550c26f8a21546ab46c97ec 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

+ 7 - 7
patches/5.10/0008-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 80d0695647188c8669b66370d6a6e78a0c7220d2 Mon Sep 17 00:00:00 2001
+From 9312f4e776a9360673602ce5675a6f637c92bc9e 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
@@ -34,7 +34,7 @@ Patchset: surface-typecover
  1 file changed, 98 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index d670bcd57bde..ca7544bf876e 100644
+index 8429ebe7097e..44d48e8bbe1a 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
 @@ -34,7 +34,10 @@
@@ -106,7 +106,7 @@ index d670bcd57bde..ca7544bf876e 100644
  	{ }
  };
  
-@@ -1673,6 +1693,69 @@ static void mt_expired_timeout(struct timer_list *t)
+@@ -1674,6 +1694,69 @@ static void mt_expired_timeout(struct timer_list *t)
  	clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
  }
  
@@ -176,7 +176,7 @@ index d670bcd57bde..ca7544bf876e 100644
  static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
  {
  	int ret, i;
-@@ -1696,6 +1779,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
+@@ -1697,6 +1780,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
  	td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN;
  	hid_set_drvdata(hdev, td);
  
@@ -186,7 +186,7 @@ index d670bcd57bde..ca7544bf876e 100644
  	INIT_LIST_HEAD(&td->applications);
  	INIT_LIST_HEAD(&td->reports);
  
-@@ -1725,15 +1811,19 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
+@@ -1726,15 +1812,19 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
  	timer_setup(&td->release_timer, mt_expired_timeout, 0);
  
  	ret = hid_parse(hdev);
@@ -208,7 +208,7 @@ index d670bcd57bde..ca7544bf876e 100644
  
  	ret = sysfs_create_group(&hdev->dev.kobj, &mt_attribute_group);
  	if (ret)
-@@ -1769,6 +1859,7 @@ static void mt_remove(struct hid_device *hdev)
+@@ -1770,6 +1860,7 @@ static void mt_remove(struct hid_device *hdev)
  {
  	struct mt_device *td = hid_get_drvdata(hdev);
  
@@ -216,7 +216,7 @@ index d670bcd57bde..ca7544bf876e 100644
  	del_timer_sync(&td->release_timer);
  
  	sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
-@@ -2116,6 +2207,11 @@ static const struct hid_device_id mt_devices[] = {
+@@ -2121,6 +2212,11 @@ static const struct hid_device_id mt_devices[] = {
  		MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
  			USB_DEVICE_ID_XIROKU_CSR2) },
  

+ 1 - 1
patches/5.10/0009-surface-sensors.patch

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

+ 32 - 32
patches/5.10/0010-cameras.patch

@@ -1,4 +1,4 @@
-From bd9c8c027b334c2d53c49edd520fe9739f8cced8 Mon Sep 17 00:00:00 2001
+From ed24364fb437a6054fbc366d8fc698d2fc79af7f 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.30.0
 
-From c27b4ea820458613abe934ed5618711fc4dfd5b7 Mon Sep 17 00:00:00 2001
+From 8aed30a215d2c096e1940429fff3624a67637737 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 1fcd131482e0..b2679ff185fc 100644
 -- 
 2.30.0
 
-From c4b4b84a27beb2c8c7a2f4126816f0054194a74b Mon Sep 17 00:00:00 2001
+From 97685366515d61f30839738c7b479d0ba5f4f5a0 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.30.0
 
-From 174afe3e62b8418ed241a38efc0eb91dc17fbb1e Mon Sep 17 00:00:00 2001
+From 6fc30f110028daed2167569c6dce718cb20dc31d 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 51c4dd6a8f9a..c557d189200b 100644
 -- 
 2.30.0
 
-From 6ff13bd90a00d34bba03dde6b2f26c3fdb6b01c8 Mon Sep 17 00:00:00 2001
+From 58617cfcef69ce39c279cb2f4ca9b33c48d0fca6 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Oct 2020 23:42:09 +0100
 Subject: [PATCH] software_node: Fix refcounts in
@@ -511,7 +511,7 @@ index 010828fc785b..615a0c93e116 100644
 -- 
 2.30.0
 
-From 642041031c7b532d2d83c368e371f4f62c4dd1ab Mon Sep 17 00:00:00 2001
+From cd8c81083dcefac62552fbe2e0232c0c24531556 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
@@ -563,7 +563,7 @@ index ccf0b85ae36f..62187ab5ae43 100644
 -- 
 2.30.0
 
-From 12e1ac55a9798ddcb120f2118d9f9e1e98c03cb8 Mon Sep 17 00:00:00 2001
+From 95ab872413990945f24729a3f0517b5ce1cdb2c7 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
@@ -608,7 +608,7 @@ index 4c43d30145c6..bc9c634df6df 100644
 -- 
 2.30.0
 
-From b2dc7cef2b9d918da7a2b940da79908c457cf8d3 Mon Sep 17 00:00:00 2001
+From 8008601acd83d358cfe0308224bb7e886a134419 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
@@ -652,7 +652,7 @@ index bc9c634df6df..ddba75d90af2 100644
 -- 
 2.30.0
 
-From 8452e5146e22fbe5e0e8d6cae4953187774fa4e5 Mon Sep 17 00:00:00 2001
+From 3e0e09a48830c0cb4c15dec7c5c3760d238ad884 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
@@ -755,7 +755,7 @@ index 615a0c93e116..ade49173ff8d 100644
 -- 
 2.30.0
 
-From 80b7d3402c7466e3c7302b14654ea487906a2b41 Mon Sep 17 00:00:00 2001
+From 772283d34ad71fc6dd4ebc74fb62bd680c7bcd0f 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
@@ -810,7 +810,7 @@ index ade49173ff8d..1f43c51b431e 100644
 -- 
 2.30.0
 
-From 36680076a19308bb7c676385497d53749e732516 Mon Sep 17 00:00:00 2001
+From 0bf93927e968bd0ac2a0b137f8416e5ea2cd4fe4 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
@@ -851,7 +851,7 @@ index 9506f8ec0974..72d36d46287d 100644
 -- 
 2.30.0
 
-From 66a37ce3a1006cad840edfb227b8d30eff96127c Mon Sep 17 00:00:00 2001
+From 1524841c902cef0d456370e9ec40773a8fe6b74b 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
@@ -1019,7 +1019,7 @@ index 1f43c51b431e..2ff504aca0be 100644
 -- 
 2.30.0
 
-From e9bf595805cf27d4c32c26fff7a436a27f87f3f6 Mon Sep 17 00:00:00 2001
+From de435b7905156d7a5ce8c3eeeffd14b73526b949 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
@@ -1057,7 +1057,7 @@ index 7ac87f18a10f..7d60f24240a4 100644
 -- 
 2.30.0
 
-From 04992b1d41966cd2b530f1c8e87c419b879c13ee Mon Sep 17 00:00:00 2001
+From 441936189d0bb02ecc81b9c199e6b7c11db462df 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
@@ -1088,7 +1088,7 @@ index 281de213ef47..5a1c6e959aa8 100644
 -- 
 2.30.0
 
-From efcc6013048dfe65c2867a18454c83db7d5706cc Mon Sep 17 00:00:00 2001
+From e1228c81e5c347a906bfb35909d0a933e9f3b0f5 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
@@ -1123,7 +1123,7 @@ rename to drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
 -- 
 2.30.0
 
-From bb53a2cedba77977298f3760b79fcaf2fb4de35e Mon Sep 17 00:00:00 2001
+From d3156ac8e9ec15e8d8b048566208fc79fd4d8310 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
@@ -1164,7 +1164,7 @@ index e3ab003a6c85..9dd896d085ec 100644
 -- 
 2.30.0
 
-From 47a7ed8249f90d1feecd46168e01e89d80dc28af Mon Sep 17 00:00:00 2001
+From 8f6d6ea7131a9410c50d62c8bd90b8cd0a6f7c28 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
@@ -1273,7 +1273,7 @@ index 6d1879bf9440..02a716a0af5d 100644
 -- 
 2.30.0
 
-From ea1cb255acba34acd94d3a044d0dca5b896de305 Mon Sep 17 00:00:00 2001
+From 0da8a119fe89d3af5619454979cd674e5b432649 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
@@ -1350,7 +1350,7 @@ index ed0840f3d5df..6ca337c28b3c 100644
 -- 
 2.30.0
 
-From 5a38238f1349d7641f41d2a3fa86743d7c1dab2d Mon Sep 17 00:00:00 2001
+From 41237a915cef967de91160c85d7493a6b5be7ade 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
@@ -1948,7 +1948,7 @@ index 62187ab5ae43..dc3e343a37fb 100644
 -- 
 2.30.0
 
-From a7eddb344ecbaf0fc6cfb6b7e2d6179ce99d375d Mon Sep 17 00:00:00 2001
+From 688186f7c659840fd6c340a892f0a8a21efb18b9 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
@@ -2050,7 +2050,7 @@ index ddca1550cce6..78b38775f18b 100644
 -- 
 2.30.0
 
-From b6941ecfe38fb030e05392800b8c25f8f179926c Mon Sep 17 00:00:00 2001
+From a146f0d32f0171eb9ae965cd61f68912e600cba1 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
@@ -2136,7 +2136,7 @@ index 02a716a0af5d..33deb22294f2 100644
 -- 
 2.30.0
 
-From c90372cc8540d50257a8d59108d47747349c2cf4 Mon Sep 17 00:00:00 2001
+From 197141d81abfb7f5b1ad712ffffb4bcc69311a68 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()
@@ -2204,7 +2204,7 @@ index 56622658b215..65acae61dc5c 100644
 -- 
 2.30.0
 
-From 697b25c99c8bb44dc8196472bb7e8cb8dde06a3c Mon Sep 17 00:00:00 2001
+From 4d0822207995850a85f0404045605c2088eaf90f 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()
@@ -2262,7 +2262,7 @@ index 65acae61dc5c..b82aac05b17f 100644
 -- 
 2.30.0
 
-From 6bdbf1c529052c1889f733607baab8185c302376 Mon Sep 17 00:00:00 2001
+From 7770ea608e64e8be3394cb2a9ec3d533f0a6b972 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()
@@ -2326,7 +2326,7 @@ index 5b1dc1ad4fb3..47ae139e8781 100644
 -- 
 2.30.0
 
-From 4fa24b3748de7b73dcc847649be9b4fbfd826f28 Mon Sep 17 00:00:00 2001
+From 31aff03814589c16f1d18c56086a577d6aad37dd 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
@@ -2359,10 +2359,10 @@ index 56bbcb2ce61b..e27d8ef3a32c 100644
  	  This config adds ACPI operation region support for TI TPS68470 PMIC.
  	  TPS68470 device is an advanced power management unit that powers
 diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
-index 5d4de5cd6759..a73bab5e3ad2 100644
+index f20ac3d69424..751b7a733bff 100644
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -1319,7 +1319,6 @@ config GPIO_TPS65912
+@@ -1320,7 +1320,6 @@ config GPIO_TPS65912
  
  config GPIO_TPS68470
  	bool "TPS68470 GPIO"
@@ -2517,7 +2517,7 @@ index 4a4df4ffd18c..000000000000
 -- 
 2.30.0
 
-From 9c5b1c5c0d977936ed2e915f7427cf607e33c38e Mon Sep 17 00:00:00 2001
+From bd908144bb8a2bea3e2dc7505231c55bd1adf193 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
@@ -3486,7 +3486,7 @@ index 000000000000..3fe27ec0caff
 -- 
 2.30.0
 
-From 061a4b11e88c3874e17d27e80643bfd35263fdd0 Mon Sep 17 00:00:00 2001
+From 48a351bcbdc02836cc22bc4cc3ef0747e40d32e9 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
@@ -3556,7 +3556,7 @@ index 745a4e0c4994..87e45a800919 100644
 -- 
 2.30.0
 
-From 83769b18c804806940364e6c2e10831e716afdb3 Mon Sep 17 00:00:00 2001
+From 439048a506f3de2b24bfb91db533c1c0ea285c7a 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
@@ -6913,7 +6913,7 @@ index 000000000000..9a508e1f3624
 -- 
 2.30.0
 
-From c15240169394a42aa05aacbca08d7d4408521af6 Mon Sep 17 00:00:00 2001
+From 843d1cc14679a508d76685d653ffb9797f5e9e1f 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
@@ -6954,7 +6954,7 @@ index 32485e4ed42b..f9ced52ad37a 100644
 -- 
 2.30.0
 
-From 2489feebada232d948f24817ddd57bd141fa7301 Mon Sep 17 00:00:00 2001
+From 21af55c2dce8dc03a49944ae311aaf9ce9a794a0 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

+ 10 - 10
pkg/arch/kernel/PKGBUILD

@@ -47,16 +47,16 @@ sha256sums=('4401d4ee93fb1288ce8dd9d6d2c14f6390096dfb326a0f969d8d362802c80f4d'
             '458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a'
             '1ad719eb0d2eea4e364894b71199ee694c23b44269d1e5e9f4fc341fdf09b991'
             '8cd2b019aac6d3807a5cdcbbbe0aad81e63193ff3e8dffd7a79d4a1421b858f6'
-            '5e8eaf7c1d6aed9c10344969aa2a1d2adc696f43e63f4f1de9498c1303f05efa'
-            'ff39bb6c1a7f5b72acbc9772b9709926f73e552c1900b0fbe8422b3b23eb890c'
-            '30732e340214747a5d0ac1f28c847a5cd48121192b3d32e856403948d00f74d8'
-            'c3469d48eeeab8dfbe9dca74036d47169a86ab5300f4f073d5e9d26da9f39728'
-            '7444a0d26ba871642c0042eab2c590917dede865df49add4e6d4a05f99337ec8'
-            '15bb2ae62dc47cc71be2858e990b2835d4059071377efad992722a0ad9efac1d'
-            '09836ecf2e47663dd222dfe0e32c2321603e80876ba23ab99465812b5b52ff9e'
-            'a74d99f1e370cd410c99194c138817be8b69eef770f7f34c38ecc19c3c952487'
-            'ee101c7dae18a7e128a9b7a80ba7262549b27dc6f02d64adf011b1f9e04a8f9b'
-            '06b3b6433b464228ebf64b8fded5ec3b4e5b80139058e07869af5ac13835cd47')
+            '4ce28ed4c0387a44c7f0cf8a28d8b17cbc9a9be037d5d1b2a4cba07bc2a76712'
+            'ba6d197064c41b1e547fa8c86ff11380a7c9177cfbdfd1efe8501e358979ee81'
+            '8982c023f5a5d85052eaa3e78988dcd4b492cbea8a8a61c409e944e55f4e720f'
+            'bc77b1ec74301dec34c9d3b2cdc2df21f458f9e338f6107f4b0c1c91e4e8163a'
+            'daba63b194d4106d8ad5deb15053960ceb87d0f21ecc740c2cb5ed010b7f342a'
+            '66481ae447822b88a1186fb9f47711a90d9a1786133ad1755adb524fb6c6e3e4'
+            'fb6712bef9c309af8cd137a8bdce2dc886521e0a6d3217cdaea7ac7e3d63aa44'
+            'd6df043772f2e1dc21dce74ff805a64ad19de9154d0d8d8c12f4fe982c883554'
+            '0e595489ed968d6db9ac37c1c6dd141328d1317fe52425a25434ee783d51994c'
+            'f78ca3696110fe4256ccb8e1795a26f58f0776ce6ca0a5b69a13c711bc03bca6')
 
 
 export KBUILD_BUILD_HOST=archlinux