Update v5.13 patches

Changes: - Rebase onto v5.13.7 Links: - kernel: e6d532e204
2021-08-01 16:01:49 +02:00 · 2021-08-01 16:01:49 +02:00 · 9daecb5d44
parent 5c2b1e2a93
commit 9daecb5d44
12 changed files with 112 additions and 112 deletions
--- a/patches/5.13/0001-surface3-oemb.patch
+++ b/patches/5.13/0001-surface3-oemb.patch
@ -1,4 +1,4 @@
-From c3f46a736f4db084b44642c46f3112011cbea18e Mon Sep 17 00:00:00 2001
+From ac64102d43f369f992b765d1696c97f819985c16 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
--- a/patches/5.13/0002-mwifiex.patch
+++ b/patches/5.13/0002-mwifiex.patch
@ -1,4 +1,4 @@
-From 07bbae758c4f5e2fd5f90d3d2326614cddaee14a Mon Sep 17 00:00:00 2001
+From a9d7775460dfb40528def873a14f8d0e4434f6aa 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.32.0

-From 53a5ae3a76c86d1124f8436f9ce734cf64d7b695 Mon Sep 17 00:00:00 2001
+From 514d9cf0ea9e12ddf6ef37f808edba6fd4981702 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.32.0

-From 837a70e7baef080564b1efb2899675a587ee74ab Mon Sep 17 00:00:00 2001
+From 38e2edd90f66c71be7e5ebf8a9eda666cbf5b703 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.32.0

-From 967fd2b0d7e768d2e60714f785935fdf3acf83a1 Mon Sep 17 00:00:00 2001
+From 16d2c224054f65b17cfff6a0a28cc26dfface2d5 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.32.0

-From d8702aea0384f3ae1cb2977e6c43cc37a53df31d Mon Sep 17 00:00:00 2001
+From 7ade633333b6a9cba0f89e47fa7afb3657477b9e 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.32.0

-From c2a096f4f724274094e81482152e9361fe91e95b Mon Sep 17 00:00:00 2001
+From 04220a4840af7e9a636c263fb573bd5e133b54da 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
@ -970,7 +970,7 @@ index a95ebac06e13..4ec2ae72f632 100644
 -- 
 2.32.0

-From c60dac64dda6ac3a344b72e8bca66f25f4043969 Mon Sep 17 00:00:00 2001
+From bc8d4c12a06c3608359df4f6d143f253a4d08f92 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
@ -1048,7 +1048,7 @@ index 6d23308119d1..31f255428b4b 100644
 -- 
 2.32.0

-From 5781bf8b78152c46ef294120deb1952684af4dc1 Mon Sep 17 00:00:00 2001
+From ebcc5071cf6e264aafdae92ff7b3b1ebf5424ae2 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
@ -1149,7 +1149,7 @@ index 0961f4a5e415..e8deba119ff1 100644
 -- 
 2.32.0

-From bb0ff1ab207055fa4610ad850f5bbc1dea7c51b1 Mon Sep 17 00:00:00 2001
+From 4276f3ce117695cd77979f92e5764a70bd786e6d 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
@ -1206,7 +1206,7 @@ index 745946f5a519..9b62937111a1 100644
 -- 
 2.32.0

-From acd52193c0969b3a8a2902ccf118b8e754e9eac4 Mon Sep 17 00:00:00 2001
+From f60d7d06c33b5ac7a5a946ec5f1096a1c3f5ec1d 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
@ -1439,7 +1439,7 @@ index e8deba119ff1..dabc59c47de3 100644
 -- 
 2.32.0

-From 0e942160d4624518dac1d10e0516bc4da2216dbd Mon Sep 17 00:00:00 2001
+From 77ff1591c6b431c262573aeee121f29ec699f677 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
@ -1507,7 +1507,7 @@ index dabc59c47de3..146aabe14753 100644
 -- 
 2.32.0

-From a61208b3e78fc92f005c8656113d7d9c4e4d7bd9 Mon Sep 17 00:00:00 2001
+From b25d318e8e04cf3165084b4d6fb0dfacd6e62a91 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
@ -1683,7 +1683,7 @@ index 146aabe14753..8b9517c243c8 100644
 -- 
 2.32.0

-From 35a9a12d5369aaaff70b45dc989e45f8054ce02e Mon Sep 17 00:00:00 2001
+From 5bdc1220f99981baccc9a232695f9685a5c22300 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
@ -1786,7 +1786,7 @@ index 8b9517c243c8..f2797102c5a2 100644
 -- 
 2.32.0

-From f5d894195bf684cc47a280d1a19ee7be05b0a57d Mon Sep 17 00:00:00 2001
+From f869633902bb7c9b62067467b36e82621f4194e0 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
@ -1875,7 +1875,7 @@ index f2797102c5a2..ed4041ff9c89 100644
 -- 
 2.32.0

-From a1ddb6ad261b994c998e7c2c027918288d87bc1b Mon Sep 17 00:00:00 2001
+From cd7a107d18372f2324f74ab959273824f90e3348 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
@ -1902,7 +1902,7 @@ index ed4041ff9c89..64caa5c4350d 100644
 -- 
 2.32.0

-From 4e6b62df178470cd6b742aed5398f24739c8c795 Mon Sep 17 00:00:00 2001
+From ac2df2bc620f9692690b40f33b62145d6e82bbda 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
@ -1957,7 +1957,7 @@ index 64caa5c4350d..0eb31201a82b 100644
 -- 
 2.32.0

-From 65a77c93cdb3b647e8724f8ca8e9bb41d530f454 Mon Sep 17 00:00:00 2001
+From dd5226af437d01e529053108a24e76213dbccd1c 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
@ -1989,7 +1989,7 @@ index 0eb31201a82b..d62a20de3ada 100644
 -- 
 2.32.0

-From b8641d4348ed2775f24a0fd88b74da6ada8f4a11 Mon Sep 17 00:00:00 2001
+From 8b53a1b47c05c34407933b6e8dd44c8031f71324 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
@ -2078,7 +2078,7 @@ index 9b62937111a1..0a52549a1703 100644
 -- 
 2.32.0

-From 3e7c4015f1501d6866b9327c59f07c22f59178b1 Mon Sep 17 00:00:00 2001
+From ec9f467ee8cc7a8bc38c0cce06805d572e9e8ed7 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
@ -2234,7 +2234,7 @@ index d3a968ef21ef..76db9a7b8199 100644
 -- 
 2.32.0

-From 14c11ae85ab085ca03492f51118907e94f08695c Mon Sep 17 00:00:00 2001
+From 765180e267f38d4e0fb3149f2611976905fb5990 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
@ -2337,7 +2337,7 @@ index 6b5d35d9e69f..8e49ebca1847 100644
 -- 
 2.32.0

-From f4927099d23ae17141d6a2ebebf72c914bb0da0c Mon Sep 17 00:00:00 2001
+From 9c575b42ef57e5d96608d35279ffe3c8dd8dd484 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
@ -2369,7 +2369,7 @@ index d62a20de3ada..18b1a6d54bc8 100644
 -- 
 2.32.0

-From 1c5fdbc1a62c0a87385fc8c7d47deba0ea47dce1 Mon Sep 17 00:00:00 2001
+From 0d0bd2ce7cc0b9af0308f61edee6acc35c3445f9 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
@ -2409,7 +2409,7 @@ index 18b1a6d54bc8..c00791701d78 100644
 -- 
 2.32.0

-From 367630ee1d6ff10d8fc4eaf74088e4178cc3017e Mon Sep 17 00:00:00 2001
+From 734421a9ef6f9864a8221e49ce1a7b07518cc5a3 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
@ -2437,7 +2437,7 @@ index 6696bce56178..b0695432b26a 100644
 -- 
 2.32.0

-From 43daa26dd03044a5a9584920ad08d6413b3930c7 Mon Sep 17 00:00:00 2001
+From 2e55cb7733b6f83402add0698b202538f92d0f7c 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
@ -2480,7 +2480,7 @@ index b0695432b26a..9ff2058bcd7e 100644
 -- 
 2.32.0

-From 2ccda81141448162d8f2e88d101c6f384fb208b1 Mon Sep 17 00:00:00 2001
+From 74240d026e86bc7adf91b4c2fb78f273a89e8f22 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
--- a/patches/5.13/0003-ath10k.patch
+++ b/patches/5.13/0003-ath10k.patch
@ -1,4 +1,4 @@
-From 8b750d4b78c5c6db76fb445fe47149a679383acf Mon Sep 17 00:00:00 2001
+From 7309cc2fe028a75c3ae50e9637a8e9ef2113b415 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
--- a/patches/5.13/0004-ipts.patch
+++ b/patches/5.13/0004-ipts.patch
@ -1,4 +1,4 @@
-From a0ee4c030c8ffcc704f1523e44eff9e4c8d29d9a Mon Sep 17 00:00:00 2001
+From 7149d04f9f8aab2beafc35af717077f898aa4f89 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 c3393b383e59..0098f98426c1 100644
 -- 
 2.32.0

-From b7af6adf0faba83088a76a6e96601047e32de6d7 Mon Sep 17 00:00:00 2001
+From 5f4e6d7e1f1c89258ca43d3be27e290f81f50d6a 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
--- a/patches/5.13/0005-surface-sam-over-hid.patch
+++ b/patches/5.13/0005-surface-sam-over-hid.patch
@ -1,4 +1,4 @@
-From 27f215439b8fed6978c7b8aa4ab5c06ffe767d8a Mon Sep 17 00:00:00 2001
+From a283b02ab6ce5eb766ca4ddded88a4fb9e28017d 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 8ceaa88dd78f..deceed0d76c6 100644
 -- 
 2.32.0

-From 2daa0bd68fa4ce027977b160d8301cd69fc68cde Mon Sep 17 00:00:00 2001
+From 3074ef45ce9ba1491fd36271d09b4dcebda98b06 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 13 Feb 2021 16:41:18 +0100
 Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch
--- a/patches/5.13/0006-surface-sam.patch
+++ b/patches/5.13/0006-surface-sam.patch
@ -1,4 +1,4 @@
-From 529419e047ed78101c90bfe75b9aef900c71a47e Mon Sep 17 00:00:00 2001
+From f2c4e41889483422e54a109d1572194db7e1fecc Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 23 May 2021 14:09:42 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Consolidate node
@ -114,7 +114,7 @@ index ef83461fa536..4428c4330229 100644
 -- 
 2.32.0

-From 7cfa1fee5d33055aac80df5c5fd98d923cf48bb6 Mon Sep 17 00:00:00 2001
+From 8c8153dba44ac8fac94a3aba187fc41020737c4c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 15:47:49 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow registering notifiers
@ -342,7 +342,7 @@ index 0806796eabcb..cf4bb48a850e 100644
 -- 
 2.32.0

-From ae51e1e0f612e8ce069a583e189dacdfbe7616a1 Mon Sep 17 00:00:00 2001
+From 8cafd2042c5981cb2109ae99fc2c09f72fc57d6f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 15:47:50 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow enabling of events
@ -748,7 +748,7 @@ index cf4bb48a850e..7965bdc669c5 100644
 -- 
 2.32.0

-From aee14cd170550e9c16fc106846056eb4d006b044 Mon Sep 17 00:00:00 2001
+From f00f0a53697023db5a7df1c3f97ad0c6e93d94f5 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 15:47:51 +0200
 Subject: [PATCH] platform/surface: aggregator: Update copyright
@ -1014,7 +1014,7 @@ index 64276fbfa1d5..c3de43edcffa 100644
 -- 
 2.32.0

-From 3ef2675ab9aea4ff11b29e0250165bd1cbcdda46 Mon Sep 17 00:00:00 2001
+From e1ea701f13e38fd8f8eb80e245078a63676d3550 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 15:47:52 +0200
 Subject: [PATCH] platform/surface: aggregator_cdev: Add support for forwarding
@ -1713,7 +1713,7 @@ index fbcce04abfe9..4f393fafc235 100644
 -- 
 2.32.0

-From 57beefc4a8f10cc0a26f6d9299fff0574a0c1c95 Mon Sep 17 00:00:00 2001
+From 2180c46e7b66ebe72e3e005561dfac431ec8bac0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 15:47:53 +0200
 Subject: [PATCH] platform/surface: aggregator_cdev: Allow enabling of events
@ -1867,7 +1867,7 @@ index 4f393fafc235..08f46b60b151 100644
 -- 
 2.32.0

-From b26eb043920cf30a9c6dad8b02ebd78adcf1fb2c Mon Sep 17 00:00:00 2001
+From 01668133c96dcc93c98496d0f6487eb28bd136f8 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 15:47:54 +0200
 Subject: [PATCH] platform/surface: aggregator_cdev: Add lockdep support
@ -1963,7 +1963,7 @@ index 7b86b36eaaa0..30fb50fde450 100644
 -- 
 2.32.0

-From e41af53103f8422234d1ce3091b496a8a3d9b6e0 Mon Sep 17 00:00:00 2001
+From bd3bebe9b2da209cc3d43bf1b4dda2a2c82d3f15 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 2 Jun 2021 20:07:47 +0200
 Subject: [PATCH] docs: driver-api: Update Surface Aggregator user-space
@ -2141,7 +2141,7 @@ index 248c1372d879..0134a841a079 100644
 -- 
 2.32.0

-From 60ac33ea0f8194f891b9808d7d7215297de0c63c Mon Sep 17 00:00:00 2001
+From b313404598b9edbd9cd4aa1f0dcd249c20a4b37b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 23:09:06 +0200
 Subject: [PATCH] platform/surface: aggregator: Do not return uninitialized
@ -2177,7 +2177,7 @@ index 6646f4d6e10d..634399387d76 100644
 -- 
 2.32.0

-From 7640650e61d9f4fba894e321dfe7c9184b3b8a29 Mon Sep 17 00:00:00 2001
+From 081886bce6093dcf2e5e5846d2c0ba3da42c252b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 23:09:07 +0200
 Subject: [PATCH] platform/surface: aggregator: Drop unnecessary variable
@ -2210,7 +2210,7 @@ index 634399387d76..b8c377b3f932 100644
 -- 
 2.32.0

-From 4e9280059d06eca593d3da0ccc25250796676908 Mon Sep 17 00:00:00 2001
+From 1d23badd84bf25dd08c861b7c70a9d67f1a78597 Mon Sep 17 00:00:00 2001
 From: Baokun Li <libaokun1@huawei.com>
 Date: Wed, 9 Jun 2021 15:26:38 +0800
 Subject: [PATCH] platform/surface: aggregator: Use list_move_tail instead of
@ -2266,7 +2266,7 @@ index bfe1aaf38065..790f7f0eee98 100644
 -- 
 2.32.0

-From d73fd93fdf881de16ce199225ce97f3c4ce602c5 Mon Sep 17 00:00:00 2001
+From 3eb2a109216a2b4188ec4439271c47e1fd14f5c6 Mon Sep 17 00:00:00 2001
 From: Baokun Li <libaokun1@huawei.com>
 Date: Wed, 9 Jun 2021 15:24:48 +0800
 Subject: [PATCH] platform/surface: aggregator: Use list_move_tail instead of
--- a/patches/5.13/0007-surface-hotplug.patch
+++ b/patches/5.13/0007-surface-hotplug.patch
@ -1,4 +1,4 @@
-From dc902c77340127510f708d4619a82136d4672b86 Mon Sep 17 00:00:00 2001
+From 7226d638b95a39babcd3fd9823f1463c2b614b87 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Jul 2021 15:51:07 +0200
 Subject: [PATCH] Revert "Revert "PCI: PM: Do not read power state in
--- a/patches/5.13/0008-surface-typecover.patch
+++ b/patches/5.13/0008-surface-typecover.patch
@ -1,4 +1,4 @@
-From 952b0184baebea91936f24626f6142826a69e0fe Mon Sep 17 00:00:00 2001
+From c99aaa28eb1218ac6b03d17979aed60f25d15019 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
--- a/patches/5.13/0009-cameras.patch
+++ b/patches/5.13/0009-cameras.patch
@ -1,4 +1,4 @@
-From e2f96f74015cf5e7b76dd0682cd820537d084855 Mon Sep 17 00:00:00 2001
+From 992ebdb6f985a7d0c91b0da1e0f279baa0dcf705 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 3 Jun 2021 23:40:02 +0100
 Subject: [PATCH] ACPI: scan: Extend acpi_walk_dep_device_list()
@ -345,7 +345,7 @@ index ef9c1f8e8336..8339988d95c1 100644
 
 err_install_dev:
 diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
-index 3a82faac5767..0b2c4f170f4d 100644
+index 394eb42d0ec1..b934c77b735f 100644
 --- a/include/acpi/acpi_bus.h
 +++ b/include/acpi/acpi_bus.h
@@ -280,6 +280,12 @@ struct acpi_device_power {
@ -387,7 +387,7 @@ index c60745f657e9..170b9bebdb2b 100644
 -- 
 2.32.0

-From 1b2cec071b7e0069eecdf0484ce8f00f13db73d0 Mon Sep 17 00:00:00 2001
+From fd419272ad0a6de4e3b32329566f8d896ee67b64 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 3 Jun 2021 23:40:03 +0100
 Subject: [PATCH] ACPI: scan: Add function to fetch dependent of ACPI device
@ -463,7 +463,7 @@ index 607aeea9a210..7f36295579ce 100644
  * acpi_bus_scan - Add ACPI device node objects in a given namespace scope.
  * @handle: Root of the namespace scope to scan.
 diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
-index 0b2c4f170f4d..4bed30e61c5b 100644
+index b934c77b735f..db20595b24d1 100644
 --- a/include/acpi/acpi_bus.h
 +++ b/include/acpi/acpi_bus.h
@@ -692,6 +692,7 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev)
@ -477,7 +477,7 @@ index 0b2c4f170f4d..4bed30e61c5b 100644
 -- 
 2.32.0

-From d42df2176c2630a5fca42e8b5800329abc3d92ac Mon Sep 17 00:00:00 2001
+From 0d7b8793e2bc3310305a0925cfe166fd670e66f2 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 3 Jun 2021 23:40:04 +0100
 Subject: [PATCH] gpiolib: acpi: Introduce acpi_get_and_request_gpiod() helper
@ -555,7 +555,7 @@ index c73b25bc9213..566feb56601f 100644
 -- 
 2.32.0

-From 5512d9fd2db7f8b2eec25d7edbeac3980816e5e6 Mon Sep 17 00:00:00 2001
+From d0f92d8399e3cdd1f1d123f275080ae84ae13e44 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 3 Jun 2021 23:40:05 +0100
 Subject: [PATCH] gpiolib: acpi: Add acpi_gpio_get_io_resource()
@ -634,7 +634,7 @@ index 170b9bebdb2b..e8ba7063c000 100644
 -- 
 2.32.0

-From 60e4b245124183d33b750624152e7e16ce87dda3 Mon Sep 17 00:00:00 2001
+From 0954df3509b6d7846a1fe3a7e2141df56e356e9e Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 3 Jun 2021 23:40:06 +0100
 Subject: [PATCH] platform/x86: Add intel_skl_int3472 driver
@ -1779,7 +1779,7 @@ index 000000000000..c05b4cf502fe
 -- 
 2.32.0

-From 1cbdca0dd169f231cb04b062ffde1eda5550a704 Mon Sep 17 00:00:00 2001
+From 8e6a17c1fb9c65042c57a672723bb466263fdff2 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 3 Jun 2021 23:40:07 +0100
 Subject: [PATCH] mfd: tps68470: Remove tps68470 MFD driver
@ -1977,7 +1977,7 @@ index 4a4df4ffd18c..000000000000
 -- 
 2.32.0

-From f13e17ff4576afb3001b174ac8b4b524ab93543f Mon Sep 17 00:00:00 2001
+From 1be6852a35b534b0542abf12618d6eb607c9eb4a Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 18 Jun 2021 15:55:10 +0300
 Subject: [PATCH] platform/x86: intel_skl_int3472: Free ACPI device resources
@ -2037,7 +2037,7 @@ index 8c18dbff1c43..48a00a1f4fb6 100644
 -- 
 2.32.0

-From 09f9e91d7d377c8b5506ad6c49cea57ea1c4981a Mon Sep 17 00:00:00 2001
+From eaa1d370d53f858398d657512f9b859f46200fae Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 18 Jun 2021 15:55:11 +0300
 Subject: [PATCH] platform/x86: intel_skl_int3472: Fix dependencies (drop
@ -2071,7 +2071,7 @@ index c112878e833b..62e5d4cf9ee5 100644
 -- 
 2.32.0

-From a43840fc14c54451d42e2db54c4fccbe05ecd64f Mon Sep 17 00:00:00 2001
+From 33a8c7b91485e32852f34bfa7f9c791432bc3295 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 18 Jun 2021 15:55:12 +0300
 Subject: [PATCH] platform/x86: intel_skl_int3472: Use ACPI GPIO resource
@ -2234,7 +2234,7 @@ index 48a00a1f4fb6..fd681d2a73fe 100644
 -- 
 2.32.0

-From 974314d679603b02858356fb28762901d8292cac Mon Sep 17 00:00:00 2001
+From 3d5afe81a26b11d92fad45cd5df06d3e14fa757b Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 18 Jun 2021 15:55:13 +0300
 Subject: [PATCH] platform/x86: intel_skl_int3472: Provide
@ -2308,7 +2308,7 @@ index fd681d2a73fe..2638d375e226 100644
 -- 
 2.32.0

-From 4d7b2d994ef8aa2bbbcdc1c0c10cf92acdbce3aa Mon Sep 17 00:00:00 2001
+From e4d7031ea41df1c748c7dbfb34b0ef5d477f1d48 Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 18 Jun 2021 15:55:14 +0300
 Subject: [PATCH] platform/x86: intel_skl_int3472: Provide
@ -2380,7 +2380,7 @@ index 2638d375e226..17c6fe830765 100644
 -- 
 2.32.0

-From 8277d9fe644ad60fe5fefd54ceba3f59443e8c66 Mon Sep 17 00:00:00 2001
+From ac9b97f812522a5883475806c01f8d428c918f06 Mon Sep 17 00:00:00 2001
 From: Dan Carpenter <dan.carpenter@oracle.com>
 Date: Fri, 25 Jun 2021 16:01:04 +0300
 Subject: [PATCH] platform/x86: intel_skl_int3472: Uninitialized variable in
@ -2423,7 +2423,7 @@ index 17c6fe830765..9fe0a2527e1c 100644
 -- 
 2.32.0

-From a744627e44ebdd5fb70d218ecafc3e52c0b9b6e7 Mon Sep 17 00:00:00 2001
+From fc185f6c395bf41efe922af66990c40457f1cdb0 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 5 Apr 2021 23:56:53 +0100
 Subject: [PATCH] media: ipu3-cio2: Toggle sensor streaming in pm runtime ops
@ -2483,7 +2483,7 @@ index fecef85bd62e..9dafb9470708 100644
 -- 
 2.32.0

-From 5018e674bf1246bb9fa8b4493db0352f8e1109de Mon Sep 17 00:00:00 2001
+From 25d94cf625fb978843dde8abe1ddd540be6f9730 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 5 Apr 2021 23:56:54 +0100
 Subject: [PATCH] media: i2c: Add support for ov5693 sensor
@ -4126,7 +4126,7 @@ index 000000000000..276f625d4d23
 -- 
 2.32.0

-From e92c2233ce598c5a04ed9f073daf842e8abf92ed Mon Sep 17 00:00:00 2001
+From 0a7035eb212e9d9da9757ca3dfbe7f75db5fcb42 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
@ -4151,7 +4151,7 @@ Patchset: cameras
 2 files changed, 44 insertions(+), 4 deletions(-)

 diff --git a/drivers/media/pci/intel/ipu3/cio2-bridge.c b/drivers/media/pci/intel/ipu3/cio2-bridge.c
-index 4657e99df033..15cf65a141b6 100644
+index 59a36f922675..d4a48cec2644 100644
 --- a/drivers/media/pci/intel/ipu3/cio2-bridge.c
 +++ b/drivers/media/pci/intel/ipu3/cio2-bridge.c
@@ -29,6 +29,7 @@ static const struct cio2_sensor_config cio2_supported_sensors[] = {
@ -4230,7 +4230,7 @@ index 4657e99df033..15cf65a141b6 100644
 	int ret;
 
 	for_each_acpi_dev_match(adev, cfg->hid, NULL, -1) {
-@@ -194,11 +225,15 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
+@@ -191,11 +222,15 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
 		if (ret)
 			goto err_put_adev;
 
@ -4247,7 +4247,7 @@ index 4657e99df033..15cf65a141b6 100644
 		}
 
 		cio2_bridge_create_fwnode_properties(sensor, bridge, cfg);
-@@ -206,7 +241,7 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
+@@ -203,7 +238,7 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
 
 		ret = software_node_register_nodes(sensor->swnodes);
 		if (ret)
@ -4256,7 +4256,7 @@ index 4657e99df033..15cf65a141b6 100644
 
 		fwnode = software_node_fwnode(&sensor->swnodes[
 						      SWNODE_SENSOR_HID]);
-@@ -227,6 +262,8 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
+@@ -225,6 +260,8 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
 
 err_free_swnodes:
 	software_node_unregister_nodes(sensor->swnodes);
@ -4289,7 +4289,7 @@ index dd0ffcafa489..924d99d20328 100644
 -- 
 2.32.0

-From 1b512cf8e1e77363a4b72bb4ce13770c295d9e05 Mon Sep 17 00:00:00 2001
+From 7ba164dee392221e92d0e3f8c659232a21b65696 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
@ -4308,7 +4308,7 @@ Patchset: cameras
 2 files changed, 37 insertions(+), 9 deletions(-)

 diff --git a/drivers/media/pci/intel/ipu3/cio2-bridge.c b/drivers/media/pci/intel/ipu3/cio2-bridge.c
-index 15cf65a141b6..f757b64eb483 100644
+index d4a48cec2644..1052885caa25 100644
 --- a/drivers/media/pci/intel/ipu3/cio2-bridge.c
 +++ b/drivers/media/pci/intel/ipu3/cio2-bridge.c
@@ -73,21 +73,36 @@ static int cio2_bridge_read_acpi_buffer(struct acpi_device *adev, char *id,
@ -4393,7 +4393,7 @@ index 924d99d20328..e1e388cc9f45 100644
 -- 
 2.32.0

-From 6c82cd1840e58b189c6b632e0b5cfa3e066cd843 Mon Sep 17 00:00:00 2001
+From 0c6db62f6fe848e23023036a363828d451e3f28e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 Date: Thu, 6 May 2021 07:52:44 +0200
 Subject: [PATCH] cio2-bridge: Use correct dev_properties size
@ -4419,7 +4419,7 @@ index e1e388cc9f45..deaf5804f70d 100644
 -- 
 2.32.0

-From 5c8f67925d518d45d6b058314328f8f8c1ed2da1 Mon Sep 17 00:00:00 2001
+From fedcf87c56b1cac2ba8e91e1826bacdf4828e997 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 20 May 2021 23:31:04 +0100
 Subject: [PATCH] media: i2c: Fix vertical flip in ov5693
@ -4454,7 +4454,7 @@ index 276f625d4d23..1653fb49f6e0 100644
 -- 
 2.32.0

-From c4eab6c5c3cf286bc92835d67384dd14b6101c73 Mon Sep 17 00:00:00 2001
+From 711390dd56911d3c4f588b7add3098c99289662c Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 9 Jul 2021 16:39:18 +0100
 Subject: [PATCH] media: i2c: Add ACPI support to ov8865
@ -4505,7 +4505,7 @@ index 9ecf180635ee..a28adf45b1b1 100644
 -- 
 2.32.0

-From cd7672ec93d6c4119739ea6f9e4407163b919416 Mon Sep 17 00:00:00 2001
+From e1a8ffd7826a949b81bfcd94ca187fc65bdbd03c Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 21:20:17 +0100
 Subject: [PATCH] media: i2c: Fix incorrect value in comment
@ -4535,7 +4535,7 @@ index a28adf45b1b1..7d716b0d47c1 100644
 -- 
 2.32.0

-From 70622f1983070f298a027ea7d7084fb880baa96d Mon Sep 17 00:00:00 2001
+From 629626c88dd3b77a74d2fa05799d0e0618057fe1 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 22:21:52 +0100
 Subject: [PATCH] media: i2c: Check fwnode->secondary for endpoint
@ -4584,7 +4584,7 @@ index 7d716b0d47c1..5fb290a6fc6a 100644
 -- 
 2.32.0

-From 0b0fdc2c12c8c2b20fb1b261ab73ef874e52dddf Mon Sep 17 00:00:00 2001
+From 37752b11a384ee1533a2f65a4f04e56237a53e00 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 22:00:25 +0100
 Subject: [PATCH] media: i2c: Support 19.2MHz input clock in ov8865
@ -4899,7 +4899,7 @@ index 5fb290a6fc6a..cae7dc9da49d 100644
 -- 
 2.32.0

-From 7d30067362c26686e7ec07f19476f40854933f59 Mon Sep 17 00:00:00 2001
+From 24ae18706c8fb7e9a05b2150449bcc24c3e0ef9a Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 22:19:10 +0100
 Subject: [PATCH] media: i2c: Add .get_selection() support to ov8865
@ -5001,7 +5001,7 @@ index cae7dc9da49d..3ce0af7e0054 100644
 -- 
 2.32.0

-From 422fa6ca568b4c3017cedade379b5867f8973d8d Mon Sep 17 00:00:00 2001
+From f1ffe1afe14cc4c8385d4fe8cd606bee98f8511d Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 22:34:43 +0100
 Subject: [PATCH] media: i2c: Switch control to V4L2_CID_ANALOGUE_GAIN
@ -5052,7 +5052,7 @@ index 3ce0af7e0054..c0c6b1d7e1ed 100644
 -- 
 2.32.0

-From 098ad2823b9b584fb002a9f5189d5b081e781cd0 Mon Sep 17 00:00:00 2001
+From b10af323ddb3a2dc6f95a05bd9f6a4c978dece7a Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 12 Jul 2021 22:54:56 +0100
 Subject: [PATCH] media: i2c: Add vblank control to ov8865
@ -5162,7 +5162,7 @@ index c0c6b1d7e1ed..5f67d85e33bc 100644
 -- 
 2.32.0

-From 57b016527f120221e07d6f88c1e79033892f17bf Mon Sep 17 00:00:00 2001
+From 12b0a5983a2a68eb62e699461ed177055d921c30 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Tue, 13 Jul 2021 23:40:33 +0100
 Subject: [PATCH] media: i2c: Add hblank control to ov8865
@ -5232,7 +5232,7 @@ index 5f67d85e33bc..66754ff62a22 100644
 -- 
 2.32.0

-From 56c98963ff3bf7714979ae1422ae11296bd0b968 Mon Sep 17 00:00:00 2001
+From 85955f09830ee494217b2a18837d4f2e95ac0330 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Tue, 13 Jul 2021 23:43:17 +0100
 Subject: [PATCH] media: i2c: cap exposure at height + vblank in ov8865
@ -5313,7 +5313,7 @@ index 66754ff62a22..93e741952050 100644
 -- 
 2.32.0

-From 330e3a176fc74c2318fab7cbef5427d584c5d5eb Mon Sep 17 00:00:00 2001
+From f141e7e2bcd392b10d7f82987a8a1a8c49e71580 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 14 Jul 2021 18:05:44 +0100
 Subject: [PATCH] media: i2c: Remove unused macros from ov8865
@ -5587,7 +5587,7 @@ index 93e741952050..fd4de2ea1fa9 100644
 -- 
 2.32.0

-From 9deee711766e54b3914d743eaba36d0932ae6104 Mon Sep 17 00:00:00 2001
+From bb55cff958fd4bf64468164e3f0ad8a0647812b2 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 16 Jul 2021 00:00:54 +0100
 Subject: [PATCH] media: i2c: Switch exposure control unit to lines
@ -5634,7 +5634,7 @@ index fd4de2ea1fa9..1905028742d5 100644
 -- 
 2.32.0

-From 566d4898ef03986c333fa72b7903b050b765c18f Mon Sep 17 00:00:00 2001
+From 176728ce39603458d35dcbfbb1dee1d330ff5f62 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 16 Jul 2021 22:56:15 +0100
 Subject: [PATCH] media: i2c: Add controls from fwnode to ov8865
@ -5679,7 +5679,7 @@ index 1905028742d5..e88825ea76aa 100644
 -- 
 2.32.0

-From 74abcfb30ed278ef5dd99a51ce061f48c7eaaf61 Mon Sep 17 00:00:00 2001
+From 837f53b7af8a7c9d8ff7c3ad3917df3842e7d099 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 14 Jul 2021 00:05:04 +0100
 Subject: [PATCH] media: ipu3-cio2: Add INT347A to cio2-bridge
@ -5696,7 +5696,7 @@ Patchset: cameras
 1 file changed, 2 insertions(+)

 diff --git a/drivers/media/pci/intel/ipu3/cio2-bridge.c b/drivers/media/pci/intel/ipu3/cio2-bridge.c
-index f757b64eb483..05d607cf5962 100644
+index 1052885caa25..856dc7439a59 100644
 --- a/drivers/media/pci/intel/ipu3/cio2-bridge.c
 +++ b/drivers/media/pci/intel/ipu3/cio2-bridge.c
@@ -24,6 +24,8 @@ static const struct cio2_sensor_config cio2_supported_sensors[] = {
--- a/patches/5.13/0010-amd-gpio.patch
+++ b/patches/5.13/0010-amd-gpio.patch
@ -1,4 +1,4 @@
-From 35483aa7d33e550d8e42ef14261e525da65148c8 Mon Sep 17 00:00:00 2001
+From b80421e31b97978ab5bf2ce70f0bb401e8a5924d Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Sat, 29 May 2021 17:47:38 +1000
 Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7
@ -65,7 +65,7 @@ index e90310cbe73a..d89aebf69ce1 100644
 -- 
 2.32.0

-From ed288dd7f50f4c3526f175dc4b10a79ed283faa7 Mon Sep 17 00:00:00 2001
+From b223d7904aef22d1f4aa2f484a81f1604dbb72d1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 3 Jun 2021 14:04:26 +0200
 Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override
--- a/patches/5.13/0011-amd-s0ix.patch
+++ b/patches/5.13/0011-amd-s0ix.patch
@ -1,4 +1,4 @@
-From 53e0ccaa12ebdb5bcf9f7254b87239991ccd1419 Mon Sep 17 00:00:00 2001
+From 4889855e48e5dc7465e8f187cf955bb681738750 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Sat, 29 May 2021 22:27:25 +1000
 Subject: [PATCH] platform/x86: amd-pmc: Add device HID for AMD PMC
@ -31,7 +31,7 @@ index b9da58ee9b1e..0b5578a8a449 100644
 -- 
 2.32.0

-From f4eed02583865a6406e0da7a50a5285f636f2f63 Mon Sep 17 00:00:00 2001
+From 504c00ecbf80aba3f61abb48fe2c10ba3ca4424e Mon Sep 17 00:00:00 2001
 From: Marcin Bachry <hegel666@gmail.com>
 Date: Tue, 16 Mar 2021 15:28:51 -0400
 Subject: [PATCH] PCI: quirks: Quirk PCI d3hot delay for AMD xhci
@ -62,7 +62,7 @@ index 6d74386eadc2..446f8f7b0ee4 100644
 -- 
 2.32.0

-From d8249792e6555841ae9c37c731907007b78a98ae Mon Sep 17 00:00:00 2001
+From 618a6568b8c78aa76b948de4523661c1b32eb2ef Mon Sep 17 00:00:00 2001
 From: Mario Limonciello <mario.limonciello@amd.com>
 Date: Wed, 9 Jun 2021 13:40:17 -0500
 Subject: [PATCH] ACPI: Check StorageD3Enable _DSD property in ACPI code
@ -128,10 +128,10 @@ index 9d2d3b9bb8b5..b20ae93415f0 100644
 +
 #endif /* CONFIG_PM */
 diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index 42ad75ff1348..5a72bdf5ad03 100644
+index d963f25fc7ae..66455e2261d0 100644
 --- a/drivers/nvme/host/pci.c
 +++ b/drivers/nvme/host/pci.c
-@@ -2828,32 +2828,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev)
+@@ -2880,32 +2880,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev)
 	return 0;
 }
 
@ -164,7 +164,7 @@ index 42ad75ff1348..5a72bdf5ad03 100644
 static void nvme_async_probe(void *data, async_cookie_t cookie)
 {
 	struct nvme_dev *dev = data;
-@@ -2903,7 +2877,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+@@ -2955,7 +2929,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 	quirks |= check_vendor_combination_bug(pdev);
 
@ -199,7 +199,7 @@ index e8ba7063c000..66c43abef4a4 100644
 -- 
 2.32.0

-From 96bd66f16139173ea0f6e9d2d1ccbdd3bd540ba8 Mon Sep 17 00:00:00 2001
+From 96f363d1fd7c2c84c34a56cc1f46428379b7dad5 Mon Sep 17 00:00:00 2001
 From: Mario Limonciello <mario.limonciello@amd.com>
 Date: Wed, 9 Jun 2021 13:40:18 -0500
 Subject: [PATCH] ACPI: Add quirks for AMD Renoir/Lucienne CPUs to force the D3
@ -322,7 +322,7 @@ index bdc1ba00aee9..5298bb4d81fe 100644
 -- 
 2.32.0

-From f258eeae70ba67983e17cb9223af39dd046734a7 Mon Sep 17 00:00:00 2001
+From 5f752254fac28f8c15b6c3c257e6e71e3aaae907 Mon Sep 17 00:00:00 2001
 From: Alex Deucher <alexander.deucher@amd.com>
 Date: Wed, 17 Mar 2021 10:38:42 -0400
 Subject: [PATCH] platform/x86: force LPS0 functions for AMD
@ -364,7 +364,7 @@ index 2d7ddb8a8cb6..482e6b23b21a 100644
 -- 
 2.32.0

-From 00599592d7996ac7375d212f1ab81fe49a012c15 Mon Sep 17 00:00:00 2001
+From 44dfe6c38ca8066e141e0a70cd7205ad4887e7eb Mon Sep 17 00:00:00 2001
 From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 Date: Thu, 17 Jun 2021 17:00:35 +0530
 Subject: [PATCH] platform/x86: amd-pmc: Fix command completion code
@ -417,7 +417,7 @@ index 0b5578a8a449..535e431f98a8 100644
 -- 
 2.32.0

-From e5f9478862c5b7f80b85fefb5b2bc2717f714fc2 Mon Sep 17 00:00:00 2001
+From 8a033f828c0dc65626f041e4377a8563c8fcc4b0 Mon Sep 17 00:00:00 2001
 From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 Date: Thu, 17 Jun 2021 17:00:36 +0530
 Subject: [PATCH] platform/x86: amd-pmc: Fix SMU firmware reporting mechanism
@ -507,7 +507,7 @@ index 535e431f98a8..d32f0a0eeb9f 100644
 -- 
 2.32.0

-From 8ccfe342da01ede74e2e3f15d62761160f31d323 Mon Sep 17 00:00:00 2001
+From 6a0392fde32139f2a8d3d354fed6b145fa4f3e15 Mon Sep 17 00:00:00 2001
 From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 Date: Thu, 17 Jun 2021 17:00:37 +0530
 Subject: [PATCH] platform/x86: amd-pmc: Add support for logging SMU metrics
@ -786,7 +786,7 @@ index d32f0a0eeb9f..b5249fdeb95f 100644
 -- 
 2.32.0

-From fcc792edc7d3b1276e7f0c8c90325f86511e83e3 Mon Sep 17 00:00:00 2001
+From 5fefd0eb9254e2162a2cc896d410c9bf3b7f6a8a Mon Sep 17 00:00:00 2001
 From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 Date: Thu, 17 Jun 2021 17:00:38 +0530
 Subject: [PATCH] platform/x86: amd-pmc: Add support for logging s0ix counters
@ -910,7 +910,7 @@ index b5249fdeb95f..b6ad290c9a86 100644
 -- 
 2.32.0

-From df1ad21ef05a3ef8f2ddb7a8b15ef59169debaaf Mon Sep 17 00:00:00 2001
+From c2a925c50d1b8c2fbb69f00eb876e77861f4b088 Mon Sep 17 00:00:00 2001
 From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 Date: Thu, 17 Jun 2021 17:00:39 +0530
 Subject: [PATCH] platform/x86: amd-pmc: Add support for ACPI ID AMDI0006
@ -939,7 +939,7 @@ index b6ad290c9a86..2a73fe0deaf3 100644
 -- 
 2.32.0

-From 79367b928cef6abc3252bfa1267f3922cfd416f0 Mon Sep 17 00:00:00 2001
+From 81bf3ec4b78e7a521db63da29bd824fc57e6768f Mon Sep 17 00:00:00 2001
 From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 Date: Thu, 17 Jun 2021 17:00:40 +0530
 Subject: [PATCH] platform/x86: amd-pmc: Add new acpi id for future PMC
@ -993,7 +993,7 @@ index 2a73fe0deaf3..5a2be598fc2e 100644
 -- 
 2.32.0

-From 1dfb9f3dd5923b7fb1ab6e25d98ab54128ce8765 Mon Sep 17 00:00:00 2001
+From 55daf6e146af2139e411d98474cfec9945374bbc Mon Sep 17 00:00:00 2001
 From: Pratik Vishwakarma <Pratik.Vishwakarma@amd.com>
 Date: Thu, 17 Jun 2021 11:42:08 -0500
 Subject: [PATCH] ACPI: PM: s2idle: Use correct revision id
--- a/pkg/arch/kernel/PKGBUILD
+++ b/pkg/arch/kernel/PKGBUILD
@ -48,17 +48,17 @@ sha256sums=('SKIP'
            'fcfb29005032125010bcf18ce2f177af7c84c74cff729de8f0cc3e4a552a59a4'
            '252c7a78ffb1efe9751aabc93cc79031ef69dbc95baa7970cbaabcd5474fe7d8'
            '9474de18769968c5558fedda5be354fe0babf1365541d4d0ac8e1ac47d4bbb88'
-            'e437d6112e7a2946d35e365eadf99e36b640cd214705e26b0e7680d9900b9c92'
-            'abe5b9ad5a22aefc9a28e6a905d565b4b0e3d9ae635a98fc2a548af37c401faf'
-            'da91f889b25a91d5ecf70980a2664f8af1e22d2b6791b5062409409db34aa6ef'
-            '1c8956cd5209725daffd986877866a3246752cbc082ce6564d4b9ab6cc5be094'
-            '031d436f746a5d695d1cefec03f65258f03f5e6a9adb61d9698a4e5c94d350ad'
-            '86dba38b6179e4e75fe147dd9eaf35b7fc0bcabc719c3a7c39b1f17f07fd525c'
-            '4b75ce4239ba1e134191eb40fa7a084d4162d0703bd231dbfa3b8009456940a7'
-            '0a6682440a701a63f7c06bdf4b75bebfa652eab967cda674a79530d24d4c9dd3'
-            '321956949c4cb17ee84ca5abd1ec2ed022df5b2aaf3baf8d35f2423d0ec05c08'
-            '0109c057ed94c3c2ab4b8dd49e48c7becb7fe3a51baaaccc7603360f3f7cbf81'
-            'a6d5e9e064938aeaf0c184b554ba5f600d63d42b5b9508002c47c8497899abc5')
+            '406e656d2b1f2f568675af268c25f8f2c21cb58a82c6f42229a889ab85050f9b'
+            '4a4b0936e5989daa5f4ce9b555f380e7132623256dce3662f07e294f8c422f99'
+            '34f4b4005b39529484980a0df8f0c4eae5d32ea62203d2628d866fa1323ebb90'
+            '81e9a4de45527fc5fe861eec9718206c1a9b96b59e48997737358234013bca57'
+            'c3e67956ca004abf59dbb00bf295b0f9480b39e79da85b8a0abca9c001fec834'
+            'd64bde29a3c84b5d564e68e0f60dbe546bd2e092deb78de7ce1bcf9cecd69c1e'
+            '3513815382e525885fa9dbc253965d0251c64b5e69050b44aaae78d1038a95e1'
+            'a2f2ca93af8e18cb16ab4934d9be65bf3eb12654298a9403506ae44252c00aac'
+            '89e2dc21fc6095c139d1a5471188ff7f2ba26f3ac5cef8f7322bfa04ebff3618'
+            '66c9cb43c302222ba538684b41d4fe708b9e326bb61777362d4a1ee07f1460ca'
+            'a6cfa44ebfcdd8bfc02961324dcbb80b89f5adf4392415a68a7b3f5617a03484')


 export KBUILD_BUILD_HOST=archlinux