From 5b68aa8d0bacef2fd896973cd8236e21c482f894 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Wed, 5 Jun 2024 12:50:31 -0500
Subject: [PATCH] kernel-6.10.0-0.rc2.20240605git32f88d65f01b.26

* Wed Jun 05 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc2.32f88d65f01b.26]
- redhat/kernel.spec: keep extra modules in original directories (Jan Stancek)
- Linux v6.10.0-0.rc2.32f88d65f01b
Resolves:

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

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 96c4e2660..5ec3fb3a4 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 = 25
+RHEL_RELEASE = 26
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel.changelog b/kernel.changelog
index 0f0b602c1..d7995ae8e 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,3 +1,8 @@
+* Wed Jun 05 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc2.32f88d65f01b.26]
+- redhat/kernel.spec: keep extra modules in original directories (Jan Stancek)
+- Linux v6.10.0-0.rc2.32f88d65f01b
+Resolves: 
+
 * Tue Jun 04 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc2.2ab795141095.25]
 - redhat/configs: Move CONFIG_BLK_CGROUP_IOCOST=y to common/generic (Waiman Long)
 - Turn on CONFIG_MFD_QCOM_PM8008 for Fedora aarch64 (Justin M. Forbes)
diff --git a/kernel.spec b/kernel.spec
index 568515e0c..d0416e7c9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -163,13 +163,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.10.0
 %define specversion 6.10.0
 %define patchversion 6.10
-%define pkgrelease 0.rc2.20240604git2ab795141095.25
+%define pkgrelease 0.rc2.20240605git32f88d65f01b.26
 %define kversion 6
-%define tarfile_release 6.10-rc2-10-g2ab795141095
+%define tarfile_release 6.10-rc2-22-g32f88d65f01b
 # This is needed to do merge window version magic
 %define patchlevel 10
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.20240604git2ab795141095.25%{?buildid}%{?dist}
+%define specrelease 0.rc2.20240605git32f88d65f01b.26%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.10.0
 
@@ -2711,7 +2711,7 @@ BuildKernel() {
         create_module_file_list "kernel" ../modules-core.list ../kernel${Variant:+-${Variant}}-modules-core.list 1
         create_module_file_list "kernel" ../modules.list ../kernel${Variant:+-${Variant}}-modules.list 0
         create_module_file_list "internal" ../modules-internal.list ../kernel${Variant:+-${Variant}}-modules-internal.list 0
-        create_module_file_list "extra" ../modules-extra.list ../kernel${Variant:+-${Variant}}-modules-extra.list 0
+        create_module_file_list "kernel" ../modules-extra.list ../kernel${Variant:+-${Variant}}-modules-extra.list 0
         if [[ "$Variant" == "rt" || "$Variant" == "rt-debug" ]]; then
             create_module_file_list "kvm" ../modules-rt-kvm.list ../kernel${Variant:+-${Variant}}-modules-rt-kvm.list 0
         fi
@@ -4017,6 +4017,10 @@ fi\
 #
 #
 %changelog
+* Wed Jun 05 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc2.32f88d65f01b.26]
+- redhat/kernel.spec: keep extra modules in original directories (Jan Stancek)
+- Linux v6.10.0-0.rc2.32f88d65f01b
+
 * Tue Jun 04 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc2.2ab795141095.25]
 - redhat/configs: Move CONFIG_BLK_CGROUP_IOCOST=y to common/generic (Waiman Long)
 - Turn on CONFIG_MFD_QCOM_PM8008 for Fedora aarch64 (Justin M. Forbes)
diff --git a/sources b/sources
index 42ebc9e70..dad224536 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd
 SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6
-SHA512 (linux-6.10-rc2-10-g2ab795141095.tar.xz) = 73037665471811f60e1f1bc5b511409ea236093f716a82b6095c25fa73ba923908887963533570bd9d421f6b6c1c855b32916176b5e49a36e9b62352d1fbfc05
-SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 168a8f95f8e6ad4a21aa788f6b2d807d7a222a24d26c36608db898a0827a5ea48464571fed199110054c4bf9cfa731e38e447687d6adb833b18371251ee6be33
-SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 92749af8d53a80ab04fe9761477b83b01b4d752fe3085a70e3fd2f54b41758200b19f626e3d3787a637ee2b20e7190c4dd180b9de1a42f24a107e3d7fdc9a293
+SHA512 (linux-6.10-rc2-22-g32f88d65f01b.tar.xz) = 5b1364b99f20a74403f3821daa8b38b6883c43be64aa7591d6cc835e0bfacebd48a8fbcca2ba02998752b634ee38035a863e74199509ff0fa37c0358c5b7fbe5
+SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 3df51ea4d6c1351f9778c45838cca69b59bec12e603a31663a2f2710ba6c7864c7aa43ec34a2df0b2ae5a38615317a3460c982a5faca2b765a4bfb763c19ea64
+SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 5e147dfcafb924c8821aff0f4f04a19993712571c68c8203fd6f83b36be2f895c8276d76af22c030c638619a802e02d0ca20773f9c63891292318ff5371d156d