From 0b4e94e470fdc55fdb3f1f880469bddf5f1a86d5 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Fri, 26 May 2023 09:09:33 -0500
Subject: [PATCH] kernel-6.4.0-0.rc3.20230526git0d85b27b0cc6.32

* Fri May 26 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc3.0d85b27b0cc6.32]
- Linux v6.4.0-0.rc3.0d85b27b0cc6
Resolves:

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

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 1232f7a10..d737e5467 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 = 31
+RHEL_RELEASE = 32
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel.spec b/kernel.spec
index e1083c6ba..0d5af68bb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -148,13 +148,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.4.0
 %define specversion 6.4.0
 %define patchversion 6.4
-%define pkgrelease 0.rc3.20230525git933174ae28ba.31
+%define pkgrelease 0.rc3.20230526git0d85b27b0cc6.32
 %define kversion 6
-%define tarfile_release 6.4-rc3-32-g933174ae28ba
+%define tarfile_release 6.4-rc3-190-g0d85b27b0cc6
 # This is needed to do merge window version magic
 %define patchlevel 4
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.20230525git933174ae28ba.31%{?buildid}%{?dist}
+%define specrelease 0.rc3.20230526git0d85b27b0cc6.32%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.4.0
 
@@ -3415,6 +3415,9 @@ fi
 #
 #
 %changelog
+* Fri May 26 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc3.0d85b27b0cc6.32]
+- Linux v6.4.0-0.rc3.0d85b27b0cc6
+
 * Thu May 25 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc3.933174ae28ba.31]
 - Linux v6.4.0-0.rc3.933174ae28ba
 
diff --git a/patch-6.4-redhat.patch b/patch-6.4-redhat.patch
index 90f252d03..48ec265ac 100644
--- a/patch-6.4-redhat.patch
+++ b/patch-6.4-redhat.patch
@@ -2566,7 +2566,7 @@ index 14f39c1e573e..d221300ae815 100644
  	}
 
 diff --git a/kernel/module/main.c b/kernel/module/main.c
-index 044aa2c9e3cb..2d646a3396ac 100644
+index b4c7e925fdb0..f1a420409762 100644
 --- a/kernel/module/main.c
 +++ b/kernel/module/main.c
 @@ -528,6 +528,7 @@ static struct module_attribute modinfo_##field = {                    \
diff --git a/sources b/sources
index d0af2c5af..b36b40cb7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.4-rc3-32-g933174ae28ba.tar.xz) = d61d0bbc7dd7afba2fa3a9200f9cc38d593f337569e875605e8908592dec7275811d52b11b2ce74353054dc299bedca600c9633aed436f0e9a56abce4cfe42a8
-SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 90c683ce512b0cb7cbf044b9b31c7c20d3e1e8ddb67c19dff27f1ed09c2ee25c6dfd05790d7ee10def298e2b1e89938a1b4e39c626d2d4200f1ad519e0139897
-SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = ae8708600e36df4b42ba3416abfae28583b8aaed83c86947943138b18a8f2c3815b8191b8cc17dd68dce04dc24dc40b06d11e63a18c9bdf4955dec7d1ab6fcec
+SHA512 (linux-6.4-rc3-190-g0d85b27b0cc6.tar.xz) = 1cd1a54e52ab087625e91b1bbe8eff4c303bd22092434c2f38b1a29d5fdbea10cf18d57312db4e1086980cc3ecce1a79af108dc90289f898a08b94550dd79f71
+SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = bea8a3c387080a655819e20b3b244ac0227258378d0a61ae7e615a24cbbee11b4be8cc7af71ecb186f76173acff0d8e90019f7adc1169a9b9b33fbcd3d2e767b
+SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 8d00b14e3474a52a97cb7a2a01ca71ee7fb3eacdd10e6d5495616f2c427989088b87d0892d1c19ae05c1f46e5780f37553d27767bb8f0c6130b02f571e84d9ce