From 03f2d78e456160f8f6f1ffe693a7bd1ad123e5d5 Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Mon, 30 Nov 2020 11:29:35 -0500
Subject: [PATCH] arm: update Android common kernel

Update ACK to ASB-2020-07-05_5.4-stable and remove the 4.19 recipe

Change-Id: Iecc56effff11ecd9619553381815445b64aa645e
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../recipes-kernel/linux/linux-arm64-ack_4.19.bb     | 12 ------------
 meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb

diff --git a/meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb b/meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb
deleted file mode 100644
index 989b0556..00000000
--- a/meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (c) 2020 Arm Limited
-#
-require linux-arm64-ack.inc
-
-SRC_URI = " \
-    git://android.googlesource.com/kernel/common.git;protocol=https;branch=android-4.19-q-release \
-    "
-
-# ASB-2020-06-05_4.19-q-release tag commit
-SRCREV = "ebd43352dd92e56f14a4985a3c99de767fc8f9cf"
diff --git a/meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb b/meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb
index 3221fd8a..aab2fd1c 100644
--- a/meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb
+++ b/meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb
@@ -12,5 +12,5 @@ SRC_URI = " \
     file://0004-libtraceevent-Fix-build-with-binutils-2.35.patch \
     "
 
-# ASB-2020-06-05_5.4-stable tag commit
-SRCREV = "2068976fd7b172b64020006efde1ee57af6bbf99"
+# ASB-2020-07-05_5.4-stable tag commit
+SRCREV = "056684c0d252f75c13be4abb7408f692eedab653"