From bcfd460728890f1cf88ea2ef5b3eb153db47378f Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Sat, 22 May 2021 15:20:11 -0500
Subject: kernel-5.12.6-0

* Sat May 22 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.6-0]
- bus: mhi: core: Download AMSS image from appropriate function (Bhaumik Bhatt)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 Patchlist.changelog     |  3 +++
 kernel.spec             | 11 +++++++----
 patch-5.12-redhat.patch |  4 ++--
 sources                 |  6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Patchlist.changelog b/Patchlist.changelog
index 0dcaa27ee..e0e542c6e 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/00f96bf907caf6f5bd6ff876958aa9a1bb45f969
+ 00f96bf907caf6f5bd6ff876958aa9a1bb45f969 bus: mhi: core: Download AMSS image from appropriate function
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/8ce924d893c80e34cbe65310fe1389e7ab4d808c
  8ce924d893c80e34cbe65310fe1389e7ab4d808c drm/rockchip: remove existing generic drivers to take over the device
 
diff --git a/kernel.spec b/kernel.spec
index 14ce9979e..c94be4463 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -106,7 +106,7 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-%define rpmversion 5.12.5
+%define rpmversion 5.12.6
 %define stableversion 5.12
 %define pkgrelease 300
 
@@ -623,7 +623,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.12.5.tar.xz
+Source0: linux-5.12.6.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1277,8 +1277,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.12.5 -c
-mv linux-5.12.5 linux-%{KVERREL}
+%setup -q -n kernel-5.12.6 -c
+mv linux-5.12.6 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2792,6 +2792,9 @@ fi
 #
 #
 %changelog
+* Sat May 22 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.6-0]
+- bus: mhi: core: Download AMSS image from appropriate function (Bhaumik Bhatt)
+
 * Wed May 19 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.5-0]
 - drm/rockchip: remove existing generic drivers to take over the device (Javier Martinez Canillas)
 - fedora: enable zonefs (Damien Le Moal)
diff --git a/patch-5.12-redhat.patch b/patch-5.12-redhat.patch
index 5f42bae10..c8ad8abe9 100644
--- a/patch-5.12-redhat.patch
+++ b/patch-5.12-redhat.patch
@@ -66,7 +66,7 @@ index 75a9dd98e76e..3ff3291551f9 100644
 
  Boot into System Kernel
 diff --git a/Makefile b/Makefile
-index f60212a0412c..7424a878605f 100644
+index dd021135838b..834afa29b14c 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -495,6 +495,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
@@ -1027,7 +1027,7 @@ index a751553fa0db..dbb981876556 100644
 +obj-$(CONFIG_ARM64) += pcie-tegra194.o
  endif
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 6fa216e52d14..cb38e94a3033 100644
+index 0e94190ca4e8..dfc5d6772e64 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -22,6 +22,8 @@
diff --git a/sources b/sources
index 513e971ac..85ce71e34 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.12.5.tar.xz) = 0ea869ac6e6c1ce571eaa6d1b4273bbea7bcdd1a66f68c33a83355ee3990a48b635bf7498d4f1137ab612e84a3f730012b519a651dea897a46c12f1392b877f0
-SHA512 (kernel-abi-whitelists-5.12.5-300.tar.bz2) = a926796b02f8e56a8452c5b7179c7332577888111f39561069ba17a839a688f9d8e8e779ddf8a804d91066d1b4440e0b7a9eec368f619c909057369fe027ed53
-SHA512 (kernel-kabi-dw-5.12.5-300.tar.bz2) = 7633d58e2d8fda3eabe905138ead17808aaa538e80843a6dacecc99bd44e4173750222aef1772bb1cbb6e2ad4785cf3e4b84451d1eedcf8a0f612f246d6d3520
+SHA512 (linux-5.12.6.tar.xz) = d32118c20439e68b00c5a57ace70049272753263e3d6e9a48483995f42cf7b2256fb3c4017525d32281151d68a0d8e79192b209f200e42e60bce99f07ed13398
+SHA512 (kernel-abi-whitelists-5.12.6-300.tar.bz2) = 0551c3fc5833440f301fe50beef3e081259cf7602d3ebdf1d4ab1f2dd58419d45a72bb66f1dcfb88a20225e11fca40f6b6fcf02eaadfb8e20c59431e4b34f0a6
+SHA512 (kernel-kabi-dw-5.12.6-300.tar.bz2) = 99eb304cae38c04da82273e0897a239e39c7b4c50f1ededfff49f19867b263d1b5fb7d792ff68a5f14c5206410196c44b129f510f38b0d2065aa685bd23ee41c
-- 
cgit