arm/kernel: fix previous patch

The previous patch broke for qemuarm64-sbsa, ebcause they share the same
defconfig patch but now the upstream kernel SHAs are different.  Change
them to have the same SHAs.

Also, the previous patch lost the patch header.  So re-add that.

Signed-off-by: Jon Mason <jon.mason@arm.com>

meta-arm/recipes-kernel/linux/linux-yocto/defconfig.patch

@@ -1,3 +1,15 @@
+From c72967164b63ea16c7c0276a306b66797998b62a Mon Sep 17 00:00:00 2001
+From: Jon Mason <jdmason@kudzu.us>
+Date: Sat, 1 May 2021 17:18:37 -0400
+Subject: [PATCH] Change USB_CONN_GPIO to 'y' by default and regenerate the
+ defconfig via `make savedefconfig`.
+
+Upstream-Status: Inappropriate [not needed in newer kernels]
+Signed-off-by: Jon Mason <jon.mason@arm.com>
+---
+ arch/arm64/configs/defconfig | 65 +++++++++++++-----------------------
+ 1 file changed, 24 insertions(+), 41 deletions(-)
+
 diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
 index 6d84761d1285..8a2f7e075ba9 100644
 --- a/arch/arm64/configs/defconfig

meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend

@@ -7,6 +7,7 @@ SRC_URI_append_generic-arm64 = " \
     "
 
 FILESEXTRAPATHS_prepend_qemuarm64-sbsa = "${ARMFILESPATHS}"
+SRCREV_machine_qemuarm64-sbsa = "d6e20b2257ecfa6e796a45a4175863862a28fa11"
 SRC_URI_append_qemuarm64-sbsa = " \
     file://defconfig.patch \
     "