From 2be9b6433977a002787370c2e409ded9bde22355 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Mon, 12 Jun 2023 10:43:50 -0500
Subject: [PATCH] kernel-6.4.0-0.rc6.48

* Mon Jun 12 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc6.48]
- Linux v6.4.0-0.rc6
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 61c2648c5..076ae9c59 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 = 47
+RHEL_RELEASE = 48
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel.spec b/kernel.spec
index 72ae061fa..cf3cb8263 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.rc5.20230612git022ce8862dff.47
+%define pkgrelease 0.rc6.48
 %define kversion 6
-%define tarfile_release 6.4-rc5-305-g022ce8862dff
+%define tarfile_release 6.4-rc6
 # This is needed to do merge window version magic
 %define patchlevel 4
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20230612git022ce8862dff.47%{?buildid}%{?dist}
+%define specrelease 0.rc6.48%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.4.0
 
@@ -3436,6 +3436,9 @@ fi
 #
 #
 %changelog
+* Mon Jun 12 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc6.48]
+- Linux v6.4.0-0.rc6
+
 * Mon Jun 12 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc5.022ce8862dff.47]
 - redhat/configs: IMX8ULP pinctrl driver (Steve Best)
 - redhat/configs: increase CONFIG_FRAME_WARN for Fedora on aarch64 (Brian Masney)
diff --git a/patch-6.4-redhat.patch b/patch-6.4-redhat.patch
index 1fbe96a8d..9486c0fd9 100644
--- a/patch-6.4-redhat.patch
+++ b/patch-6.4-redhat.patch
@@ -117,7 +117,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index 09866a85bc2a..f2a166968dbe 100644
+index 0d3a9d3e73c1..7a5e4c1cbe0f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index 00b032e49..fe81ff63b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.4-rc5-305-g022ce8862dff.tar.xz) = dc23fba0ef3953732643775b65ced4c59c7d18a609391d06a13d02ea9f664516efcb607f6380f6b66ca97bbd989c6ef3d7137c65fdd54fa5014b738e299368c4
-SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 1d6600bb9a433c1c93a9e60cc4a5e1bce9e259476fe929af9d22abac80b6527a58720b110324eab02580826d0699486289fcb4e410d0b1c0edb89f2ab6112c10
-SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 7e42334261e1ee9dbebe25dc8d0391b1f95c87f20d06a860f0782d5bb74a2332ffd050c0417bc4a99d0afd3e2abc3e946325d6b7bf5975a3604593d5d84b8f51
+SHA512 (linux-6.4-rc6.tar.xz) = c5adc45407f884353d71da76c91b6d172ccb4129e8cc4cb60afabe507ef5ecde85242bac5698aebd7d1bbbb46d70e34380848b9d78e5eed5b35d538eb9f3d04d
+SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = eda90cba4e9942725d2dc2a6f0ec69c2ed5ffc73396b5c0084b499ee441757b0d2898aac27b04bd8548d1000425b6cffa53c160e65aa9901846e933781481180
+SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = fb9975a9d9017b803856e4317af0c051c95950f15122833e7913b15546a384a7643dbee53404dd84f02ee7d0d2f3028d22c351f9a35d2f256333eda465b4c352