From 8654a9b847b5d4a7f59d95d2628899f9c0bbed07 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Sun, 7 Mar 2021 18:03:57 -0600
Subject: kernel-5.11.4-6

* Sun Mar 07 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.4-6]
- PCI: Add MCFG quirks for Tegra194 host controllers (Vidya Sagar)
- Revert "PCI: Add MCFG quirks for Tegra194 host controllers" (Peter Robinson)
- forgot to push this one earlier (Justin M. Forbes)
- Reference the patch as version.patchlevel to more easily see diffs between stable releases (Justin M. Forbes)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 Makefile.rhelver        |  2 +-
 kernel.spec             | 10 +++++-----
 patch-5.11-redhat.patch |  2 +-
 sources                 |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 839383086..6fa6276ee 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 5
+RHEL_RELEASE = 6
 
 #
 # Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index cc70cea50..65d86f6a0 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -104,7 +104,7 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-%define rpmversion 5.11.3
+%define rpmversion 5.11.4
 %define stableversion 5.11
 %define pkgrelease 300
 
@@ -603,7 +603,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.11.3.tar.xz
+Source0: linux-5.11.4.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1251,8 +1251,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.11.3 -c
-mv linux-5.11.3 linux-%{KVERREL}
+%setup -q -n kernel-5.11.4 -c
+mv linux-5.11.4 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2763,7 +2763,7 @@ fi
 #
 #
 %changelog
-* Thu Mar 04 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.3-300]
+* Sun Mar 07 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.4-6]
 - PCI: Add MCFG quirks for Tegra194 host controllers (Vidya Sagar)
 - Revert "PCI: Add MCFG quirks for Tegra194 host controllers" (Peter Robinson)
 - forgot to push this one earlier (Justin M. Forbes)
diff --git a/patch-5.11-redhat.patch b/patch-5.11-redhat.patch
index ce3b0044e..98ee173da 100644
--- a/patch-5.11-redhat.patch
+++ b/patch-5.11-redhat.patch
@@ -129,7 +129,7 @@ index 000000000000..b27bcf11198f
 +
 +...
 diff --git a/Makefile b/Makefile
-index a8c1162de3a0..e38dd6eddec8 100644
+index cb9a8e823951..2b1b03c782b7 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -494,6 +494,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
diff --git a/sources b/sources
index aefbd5a4f..8c506e464 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.11.3.tar.xz) = a383c2502fea39806d545fa8e04d82cc450edefab7d9ba39395d4b3a13809649c9fb771d325a9f68fa566a06077e25fe86938bc9cf452b74d62aede27f4b5646
-SHA512 (kernel-abi-whitelists-5.11.3-300.tar.bz2) = f8467f89f1ca2535a34417b92a4407737002534a63af568c88fd68484132072679ece930b1918aa2f2ecb02da17ae5a4c7d318e82c22f9c48402781028f0944b
-SHA512 (kernel-kabi-dw-5.11.3-300.tar.bz2) = 3b24f379d27492a69ca96a48c4a4523035af3c61bdd23e33cb768d0157104b61c7f3bfb5e82999630a282eddb43ec00a338f672abd6f638708e29a35effa8539
+SHA512 (linux-5.11.4.tar.xz) = a92f0d6359ad0237422a9d3331e4b9b0d9f17e51f5d297b34f3ebcec33218b32a9452d50ba084871d56f52df50830d8a4da1c045f8cfceb2c27512c2f7398858
+SHA512 (kernel-abi-whitelists-5.11.4-300.tar.bz2) = 0746d955449dbbb75b8168f79d6f5129a7cb1888bf962d8771ead2d53504e055aa555bc3140a005cdbf34b5aafea1ad53a9b04b2e935e6b4e180a6714b3de514
+SHA512 (kernel-kabi-dw-5.11.4-300.tar.bz2) = 8785a9550722e081e6155edaa275dec9018fd9f7d0d5585daef3f4793f6246846b28553f0fa8ea35005262b550689292c6d4c314fb6b1f4c31afc64f27829c1d
-- 
cgit