From 6a1a2b058101fbb42691a23954295f6d249b5ebd Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Tue, 22 Aug 2023 07:04:59 -0500
Subject: [PATCH] kernel-6.5.0-0.rc7.20230822gitf7757129e3de.51

* Tue Aug 22 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc7.f7757129e3de.51.eln130]
- redhat/configs: Enable CONFIG_DEVICE_PRIVATE on aarch64 (David Hildenbrand) [2231407]
- redhat/configs: disable CONFIG_ROCKCHIP_ERRATUM_3588001 for RHEL (Mark Salter)
- redhat: shellcheck fixes (Prarit Bhargava)
Resolves: rhbz#2231407

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 Makefile.rhelver                     | 2 +-
 generate_all_configs.sh              | 7 ++++---
 kernel-aarch64-64k-debug-rhel.config | 4 ++--
 kernel-aarch64-64k-rhel.config       | 4 ++--
 kernel-aarch64-debug-rhel.config     | 4 ++--
 kernel-aarch64-rhel.config           | 4 ++--
 kernel-aarch64-rt-debug-rhel.config  | 4 ++--
 kernel-aarch64-rt-rhel.config        | 4 ++--
 kernel-ppc64le-debug-rhel.config     | 2 +-
 kernel-ppc64le-rhel.config           | 2 +-
 kernel-s390x-debug-rhel.config       | 2 +-
 kernel-s390x-rhel.config             | 2 +-
 kernel-s390x-zfcpdump-rhel.config    | 2 +-
 kernel-x86_64-debug-rhel.config      | 2 +-
 kernel-x86_64-rhel.config            | 2 +-
 kernel-x86_64-rt-debug-rhel.config   | 2 +-
 kernel-x86_64-rt-rhel.config         | 2 +-
 kernel.spec                          | 9 +++++++--
 mod-sign.sh                          | 2 +-
 process_configs.sh                   | 4 +++-
 sources                              | 4 ++--
 update_scripts.sh                    | 2 +-
 22 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 23c59cd4f..9826d97f6 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 = 50
+RHEL_RELEASE = 51
 
 #
 # RHEL_REBASE_NUM
diff --git a/generate_all_configs.sh b/generate_all_configs.sh
index 7a7583077..02c1f6a6d 100755
--- a/generate_all_configs.sh
+++ b/generate_all_configs.sh
@@ -21,15 +21,16 @@ fi
 
 # The +1 is to remove the - at the end of the SPECPACKAGE_NAME string
 specpackage_name_len=$((${#SPECPACKAGE_NAME} + 1))
-for i in ${SPECPACKAGE_NAME}*-"$FLAVOR".config; do
-	NEW=${SPECPACKAGE_NAME}-"$SPECRPMVERSION"-$(echo ${i:$specpackage_name_len} | sed s/-"$FLAVOR"//)
+for i in "${SPECPACKAGE_NAME}"*-"$FLAVOR".config; do
+	# shellcheck disable=SC3057
+	NEW=${SPECPACKAGE_NAME}-"$SPECRPMVERSION"-$(echo "${i:$specpackage_name_len}" | sed s/-"$FLAVOR"//)
 	mv "$i" "$NEW"
 done
 
 rm -f kernel-*-"$SECONDARY".config
 
 if [ "$DEBUGBUILDSENABLED" -eq 0 ]; then
-	for i in ${SPECPACKAGE_NAME}-*debug*.config; do
+	for i in "${SPECPACKAGE_NAME}"-*debug*.config; do
 		base=$(echo "$i" | sed -r s/-?debug//g)
 		NEW=${SPECPACKAGE_NAME}-$(echo "$base" | cut -d - -f2-)
 		mv "$i" "$NEW"
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index e0f7df018..8e41a85d6 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -1375,7 +1375,7 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
-# CONFIG_DEVICE_PRIVATE is not set
+CONFIG_DEVICE_PRIVATE=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVPORT is not set
 CONFIG_DEVTMPFS_MOUNT=y
@@ -5046,7 +5046,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index 9851554e6..d19891cda 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -1367,7 +1367,7 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
-# CONFIG_DEVICE_PRIVATE is not set
+CONFIG_DEVICE_PRIVATE=y
 # CONFIG_DEVMEM is not set
 # CONFIG_DEVPORT is not set
 CONFIG_DEVTMPFS_MOUNT=y
@@ -5023,7 +5023,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 55de1a810..b45a38122 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1372,7 +1372,7 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
-# CONFIG_DEVICE_PRIVATE is not set
+CONFIG_DEVICE_PRIVATE=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVPORT is not set
 CONFIG_DEVTMPFS_MOUNT=y
@@ -5042,7 +5042,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 40d92d6a5..1173f6fc8 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1364,7 +1364,7 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
-# CONFIG_DEVICE_PRIVATE is not set
+CONFIG_DEVICE_PRIVATE=y
 # CONFIG_DEVMEM is not set
 # CONFIG_DEVPORT is not set
 CONFIG_DEVTMPFS_MOUNT=y
@@ -5019,7 +5019,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index 0fb5f982d..1c9111e72 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -1390,7 +1390,7 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
-# CONFIG_DEVICE_PRIVATE is not set
+CONFIG_DEVICE_PRIVATE=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVPORT is not set
 CONFIG_DEVTMPFS_MOUNT=y
@@ -5178,7 +5178,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index 5bc1e3480..dca269c3e 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -1382,7 +1382,7 @@ CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_DEV_DAX_PMEM=m
-# CONFIG_DEVICE_PRIVATE is not set
+CONFIG_DEVICE_PRIVATE=y
 # CONFIG_DEVMEM is not set
 # CONFIG_DEVPORT is not set
 CONFIG_DEVTMPFS_MOUNT=y
@@ -5155,7 +5155,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index f172609ec..bb641bf25 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -4649,7 +4649,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 820816527..b448171b6 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -4628,7 +4628,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 001665d44..893e694d8 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -4592,7 +4592,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 852db6ada..e3a28674e 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -4571,7 +4571,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 197c7c52f..68c92fe15 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -4585,7 +4585,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 7b22c076f..2213cc664 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -4834,7 +4834,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 643bd2ab6..da3ec54db 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -4812,7 +4812,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index a375297c1..7c744ad5d 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -4971,7 +4971,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index dc269e24a..214b869e4 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -4949,7 +4949,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 # CONFIG_RMNET is not set
-CONFIG_ROCKCHIP_ERRATUM_3588001=y
+# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_ROCKER=m
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/kernel.spec b/kernel.spec
index bfc14d13a..b86001243 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -162,13 +162,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.5.0
 %define specversion 6.5.0
 %define patchversion 6.5
-%define pkgrelease 0.rc7.20230821gitf7757129e3de.50
+%define pkgrelease 0.rc7.20230822gitf7757129e3de.51
 %define kversion 6
 %define tarfile_release 6.5-rc7-4-gf7757129e3de
 # This is needed to do merge window version magic
 %define patchlevel 5
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.20230821gitf7757129e3de.50%{?buildid}%{?dist}
+%define specrelease 0.rc7.20230822gitf7757129e3de.51%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.5.0
 
@@ -3713,6 +3713,11 @@ fi\
 #
 #
 %changelog
+* Tue Aug 22 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc7.f7757129e3de.51.eln130]
+- redhat/configs: Enable CONFIG_DEVICE_PRIVATE on aarch64 (David Hildenbrand) [2231407]
+- redhat/configs: disable CONFIG_ROCKCHIP_ERRATUM_3588001 for RHEL (Mark Salter)
+- redhat: shellcheck fixes (Prarit Bhargava)
+
 * Mon Aug 21 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc7.f7757129e3de.50.el130]
 - Linux v6.5.0-0.rc7.f7757129e3de
 
diff --git a/mod-sign.sh b/mod-sign.sh
index c5f0c89c1..535bd59a3 100755
--- a/mod-sign.sh
+++ b/mod-sign.sh
@@ -19,7 +19,7 @@ NPROC=$(nproc)
 [ -z "$NPROC" ] && NPROC=1
 
 # NB: this loop runs 2000+ iterations. Try to be fast.
-echo "$modules" | xargs -r -n16 -P $NPROC sh -c "
+echo "$modules" | xargs -r -n16 -P "$NPROC" sh -c "
 for mod; do
     ./scripts/sign-file sha256 $MODSECKEY $MODPUBKEY \$mod
     rm -f \$mod.sig \$mod.dig
diff --git a/process_configs.sh b/process_configs.sh
index 12edf0a5f..9cd57783b 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -311,12 +311,14 @@ function process_configs()
 			process_config "$cfg" "$count"
 		fi
 		process_config "$cfg" "$count" &
+		# shellcheck disable=SC2004
 		waitpids[${count}]=$!
 		((count++))
 		while [ "$(jobs | grep -c Running)" -ge "$RHJOBS" ]; do :; done
 	done
+	# shellcheck disable=SC2048
 	for pid in ${waitpids[*]}; do
-		wait ${pid}
+		wait "${pid}"
 	done
 
 	rm "$SCRIPT_DIR"/*.config*.old
diff --git a/sources b/sources
index cda29a1d9..f7188c113 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-6.5-rc7-4-gf7757129e3de.tar.xz) = 9d35a43399a234a7f4a16db73f794c068432ffcdffb8bfe76034d6596a67e07c4975941dc2e27c1f57d5078f98f5af934d3005d5358b20f010b4801d6aaf0504
-SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 0c19f0b93a71c746c5e5525e9b5036549b05ef6b653d494d3a9c4d7c7eb85a5c9e5c8bc539aa6786733d17b98b9253f41d2e61d6fd5906d3a6032db6a028416b
-SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = ee7e7fccc2b96e0ea39fd008356ba95f5f76475711be7c06c8ecbd7fb9c44000bdd8dbfda62734a3cd71d824bb1b1df82a6db93298b65244812ffd11a85ae050
+SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 6f8ba5f8a4bcfa743f62233f534446b852ac56dc018ce225d6919bd9d9fe0a953bba6c36ec4e09695e17be4bd55e1e738d9e624644605c360e862cce3e461fb2
+SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 3d4d1d65df80cf4b3bab1809e83ba2a496fb791465456b47aa653f8e5d1a5b340c17a648ec2c5bd23c2acd347ce167c4700d7235461ac5781491d9f0bee975be
diff --git a/update_scripts.sh b/update_scripts.sh
index 38e66347f..5dce4fa94 100755
--- a/update_scripts.sh
+++ b/update_scripts.sh
@@ -7,6 +7,6 @@ fi
 TARGET="$1"
 
 for i in "$RPM_SOURCE_DIR"/*."$TARGET"; do
-	NEW=${i%.$TARGET}
+	NEW=${i%."$TARGET"}
 	cp "$i" "$(basename "$NEW")"
 done