From 701dd1ba79f4a37d7b46358b5a9194f71eea901a Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Wed, 24 Aug 2022 07:20:57 -0500
Subject: [PATCH] kernel-6.0.0-0.rc2.20220824gitc40e8341e3b3.21

* Wed Aug 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc2.c40e8341e3b3.21]
- Linux v6.0.0-0.rc2.c40e8341e3b3
Resolves:

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

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 573dc4027..befbf776d 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 = 20
+RHEL_RELEASE = 21
 
 #
 # ZSTREAM
diff --git a/kernel.spec b/kernel.spec
index 750cffba4..0bb5ab414 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -124,13 +124,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 6.0.0
 %define patchversion 6.0
-%define pkgrelease 0.rc2.20220823git072e51356cd5.20
+%define pkgrelease 0.rc2.20220824gitc40e8341e3b3.21
 %define kversion 6
-%define tarfile_release 6.0-rc2-16-g072e51356cd5
+%define tarfile_release 6.0-rc2-54-gc40e8341e3b3
 # This is needed to do merge window version magic
 %define patchlevel 0
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.20220823git072e51356cd5.20%{?buildid}%{?dist}
+%define specrelease 0.rc2.20220824gitc40e8341e3b3.21%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.0.0
 
@@ -3147,6 +3147,9 @@ fi
 #
 #
 %changelog
+* Wed Aug 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc2.c40e8341e3b3.21]
+- Linux v6.0.0-0.rc2.c40e8341e3b3
+
 * Tue Aug 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc2.072e51356cd5.20]
 - Linux v6.0.0-0.rc2.072e51356cd5
 
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch
index 42ec5b6ff..0d919dd50 100644
--- a/patch-6.0-redhat.patch
+++ b/patch-6.0-redhat.patch
@@ -2624,7 +2624,7 @@ index a4d40d98428a..2cb611a26fdc 100644
  	}
 
 diff --git a/kernel/module/main.c b/kernel/module/main.c
-index 6a477c622544..f4dbf3591f20 100644
+index a4e4d84b6f4e..d78e1bc1e3f7 100644
 --- a/kernel/module/main.c
 +++ b/kernel/module/main.c
 @@ -523,6 +523,7 @@ static struct module_attribute modinfo_##field = {                    \
diff --git a/sources b/sources
index c82b1c828..e4e6d263c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.0-rc2-16-g072e51356cd5.tar.xz) = 0a0918190c881c71a8615ff5a06fab80af41826e3f1b1268ab27988ab5c79e4908347b0ad56b637bc30a1a6122187ebacffd92436b920be96d50e0a58ca72981
-SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = da4f4535abc5a0a36e9cd7ecace39f301c5f42de605db502b3d124ae4ba2469fd7e7fe76875d567ef46fe2daed45a01ec595c1f1a68e5725d84e8b22c88fbbee
-SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 327caa06af87f78b76cbdd6cb7aa2acf037f43dc1b828484811ec7c01bd5b07050dabe11015d263e7f369eb3f3ee05f2eb829d319bbbc2759d13a3e0f62a97b9
+SHA512 (linux-6.0-rc2-54-gc40e8341e3b3.tar.xz) = 029beb70dee156c3e45ae7f1d2020789707ec727ab5d78a61b645e7f01dca1347e92eec0ba0ce79018d8f4e0276e37dd04d76ded1fdff8ac3994ec3ca22e3149
+SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = f283254c18c43637f491e787ec198e323bb2dd1d1278c13213280107cab83dce0bdaa427e6b9f02233238e0752143aab69b53c9ff5017e1c2b38664de00e3d91
+SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 8689f388fd34133505f3bcad85d693bd583fb3090d5564243b255aec3b2a27305eb785fe9c5a01d904d5c4d9a264b886b4d4804e241e1691fd1b63e340b76796