diff --git a/patches/5.8/0004-surface-sam.patch b/patches/5.8/0004-surface-sam.patch
index d75494ca5..9453c7262 100644
--- a/patches/5.8/0004-surface-sam.patch
+++ b/patches/5.8/0004-surface-sam.patch
@@ -1,4 +1,4 @@
-From 6549b6242a7aaaeb8d0c0db18bac57d60d41f3e5 Mon Sep 17 00:00:00 2001
+From e49d12efb76b008886ac0a47e9b816671e950c82 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 17 Aug 2020 01:23:20 +0200
 Subject: [PATCH 4/6] surface-sam
@@ -40,7 +40,7 @@ Subject: [PATCH 4/6] surface-sam
  .../surface_aggregator/ssh_packet_layer.h     |  170 ++
  drivers/misc/surface_aggregator/ssh_parser.c  |  224 ++
  drivers/misc/surface_aggregator/ssh_parser.h  |  152 +
- .../surface_aggregator/ssh_request_layer.c    | 1247 ++++++++
+ .../surface_aggregator/ssh_request_layer.c    | 1249 ++++++++
  .../surface_aggregator/ssh_request_layer.h    |  137 +
  drivers/misc/surface_aggregator/trace.h       |  621 ++++
  include/linux/mod_devicetable.h               |   18 +
@@ -50,7 +50,7 @@ Subject: [PATCH 4/6] surface-sam
  include/linux/surface_aggregator/serial_hub.h |  657 +++++
  scripts/mod/devicetable-offsets.c             |    8 +
  scripts/mod/file2alias.c                      |   23 +
- 46 files changed, 17909 insertions(+)
+ 46 files changed, 17911 insertions(+)
  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/dbgdev.rst
@@ -7905,7 +7905,7 @@ index 000000000000..ed93596adcf6
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/misc/surface_aggregator/controller.c b/drivers/misc/surface_aggregator/controller.c
 new file mode 100644
-index 000000000000..641a17a06da2
+index 000000000000..7d6656027f4b
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/controller.c
 @@ -0,0 +1,2509 @@
@@ -9378,7 +9378,7 @@ index 000000000000..641a17a06da2
 +{
 +	size_t msglen = SSH_COMMAND_MESSAGE_LENGTH(payload_len);
 +
-+	*rqst = kzalloc(sizeof(*rqst) + msglen, flags);
++	*rqst = kzalloc(sizeof(**rqst) + msglen, flags);
 +	if (!*rqst)
 +		return -ENOMEM;
 +
@@ -14262,17 +14262,19 @@ index 000000000000..a766223b18e7
 +#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..bd80503872d0
+index 000000000000..5494217afa88
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/ssh_request_layer.c
-@@ -0,0 +1,1247 @@
+@@ -0,0 +1,1249 @@
 +// SPDX-License-Identifier: GPL-2.0-or-later
 +
++#include <asm/unaligned.h>
 +#include <linux/atomic.h>
 +#include <linux/completion.h>
 +#include <linux/error-injection.h>
 +#include <linux/ktime.h>
 +#include <linux/list.h>
++#include <linux/slab.h>
 +#include <linux/spinlock.h>
 +#include <linux/types.h>
 +#include <linux/workqueue.h>
diff --git a/patches/5.8/0005-surface-sam-over-hid.patch b/patches/5.8/0005-surface-sam-over-hid.patch
index 99def855b..4fd45cfa8 100644
--- a/patches/5.8/0005-surface-sam-over-hid.patch
+++ b/patches/5.8/0005-surface-sam-over-hid.patch
@@ -1,4 +1,4 @@
-From a635ea46402e1a2b59691facc6b989d639596601 Mon Sep 17 00:00:00 2001
+From c60bb64dbfa33c12dd39f441405f95b60dab533e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jul 2020 17:19:53 +0200
 Subject: [PATCH 5/6] surface-sam-over-hid
diff --git a/patches/5.8/0006-surface-gpe.patch b/patches/5.8/0006-surface-gpe.patch
index a4f590e39..9e1b42e74 100644
--- a/patches/5.8/0006-surface-gpe.patch
+++ b/patches/5.8/0006-surface-gpe.patch
@@ -1,4 +1,4 @@
-From 0a0af55e3ca730ae3bd24a6396cac330f26e5f7e Mon Sep 17 00:00:00 2001
+From 5f1628a5cbab46c365dded5808524286cb8d686f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 16 Aug 2020 23:39:56 +0200
 Subject: [PATCH 6/6] surface-gpe
diff --git a/pkg/arch/kernel/PKGBUILD b/pkg/arch/kernel/PKGBUILD
index 8c56c226c..3bd6ff0c9 100644
--- a/pkg/arch/kernel/PKGBUILD
+++ b/pkg/arch/kernel/PKGBUILD
@@ -43,9 +43,9 @@ sha256sums=('eab6585c171a8aea470d32a5946a1fc43f854ae0a239c00daedb366d0e2c1132'
             'e23c77883c3dca61c5ebc6689310bbb5b28f22255354bfb02a53a43e18354643'
             'b7c4f87ca8b0b14ec5bc55cf6ed1eee9c0a567090448964cdb5b580625e386dc'
             'd37b50ea734343fb48284583ea75363d39bc747e1f8fe5a10361d09bd791a805'
-            'fc816c09817e742a8bc2fe321b8db6582d043ca0296ac3736e195c729e48c887'
-            '32e4373361fe9909c2eea7fa2bc60a2a51b67974dde26cb85ad78cc68bab5cf6'
-            'e32e0db374dde3074414e817ab0e590f66453b1e92d6dede61f4229157edc2cb')
+            '6359d231c78e3976cde00aecb7dfbb7b04ee5952eb7ad8f8de09eafd5c4d72d1'
+            'e0ec4e54262829a771b84de688750cace6be5f3d1141ba15a0812b03c6fd13b9'
+            'afe54fbf214b55ccd6cd6ee80bd194cdc1f44eb52f0967d2d8f46c6786ef1e3f')
 
 
 export KBUILD_BUILD_HOST=archlinux