From d7f2a977965e21cd26ea3aee1f39a9a9ee96803d Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Thu, 21 Sep 2023 12:16:51 -0500
Subject: [PATCH] kernel-6.6.0-0.rc2.20230921git42dc814987c1.22

* Thu Sep 21 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.6.0-0.rc2.42dc814987c1.22]
- redhat: spec: Fix typo for kernel_variant_preun for 16k-debug flavor (Neal Gompa)
- Linux v6.6.0-0.rc2.42dc814987c1
Resolves:

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

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 5a714338d..9e42da42f 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 = 21
+RHEL_RELEASE = 22
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel.spec b/kernel.spec
index 6fed85922..c7f9f328c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -163,13 +163,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.6.0
 %define specversion 6.6.0
 %define patchversion 6.6
-%define pkgrelease 0.rc2.20230919git2cf0f7156238.21
+%define pkgrelease 0.rc2.20230921git42dc814987c1.22
 %define kversion 6
-%define tarfile_release 6.6-rc2-18-g2cf0f7156238
+%define tarfile_release 6.6-rc2-48-g42dc814987c1
 # This is needed to do merge window version magic
 %define patchlevel 6
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.20230919git2cf0f7156238.21%{?buildid}%{?dist}
+%define specrelease 0.rc2.20230921git42dc814987c1.22%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.6.0
 
@@ -3334,7 +3334,7 @@ fi\
 %endif
 
 %if %{with_debug} && %{with_arm64_16k}
-%kernel_variant_preun 16k-debug
+%kernel_variant_preun -v 16k-debug
 %kernel_variant_post -v 16k-debug
 %endif
 
@@ -3694,6 +3694,10 @@ fi\
 #
 #
 %changelog
+* Thu Sep 21 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.6.0-0.rc2.42dc814987c1.22]
+- redhat: spec: Fix typo for kernel_variant_preun for 16k-debug flavor (Neal Gompa)
+- Linux v6.6.0-0.rc2.42dc814987c1
+
 * Tue Sep 19 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.6.0-0.rc2.2cf0f7156238.21]
 - Linux v6.6.0-0.rc2.2cf0f7156238
 
diff --git a/sources b/sources
index 15d737d88..3c00f1c1a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.6-rc2-18-g2cf0f7156238.tar.xz) = 804a9a74e9e3a8670bf292e2f91f25fd13ac24f5e629c7c94644ae8daf44b82a8fbee2e6d9189cfe8195fb57e6214cef6a9e0b9a0e7f85f7d9318749d730af32
-SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 55b8099b8ce13f9a74c128f6a1ce54669973d9dcef67234819109259307f370dec2b8e64e0608272e0502b19bba16fff1513d51a000acb7aba9349d8169117c3
-SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 844968854c99bc362f971f1b9f517fc763336822807d9b2de11ff758d00066e7db85146edaa1078a1ecb1ae02df3f2db7c98d70eac45f523ea97363e6f1cb112
+SHA512 (linux-6.6-rc2-48-g42dc814987c1.tar.xz) = 743976319e905ca0552211c602acfd32f2864384aefd469ada5ad02aa99b9d0883cfe32edf69eb4ee6da15a81b500b81920d1b079ad5b3057011fb7f4ae83a08
+SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 58a013941a0b95449ebb8f6cca2484a7d1e84b08707988773d422ff9bad2e603c0502e651f088d43909b1131be080c1ee975a55d70134b3ccb9be31ca80c840c
+SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = fb0b2541938e4f4034ef5324a66b2e9e7aea9a3d72ad07ca041965c504140757be1057d259914d548180d21794ec24ba189d5dcc5f5be34244ec66ef1056c4e9