kernel-6.0.0-54

* Mon Oct 03 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-54] - redhat/configs: Move CONFIG_ARM_SMMU_QCOM_DEBUG to common (Jerry Snitselaar) - Linux v6.0.0 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2022-10-03 08:53:42 -05:00 · 2022-10-03 08:53:42 -05:00 · 247e0276be
commit 247e0276be
parent 70bb4e1cb8
13 changed files with 29 additions and 26 deletions
--- 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 = 51
+RHEL_RELEASE = 54

 #
 # ZSTREAM
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@ -3953,7 +3953,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
+CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@ -3932,7 +3932,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
+CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@ -257,7 +257,6 @@ CONFIG_ARM_CMN=m
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
 CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
-# CONFIG_ARM_SMMU_QCOM_DEBUG is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
 CONFIG_ASN1=y
@ -3755,7 +3754,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
+CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@ -257,7 +257,6 @@ CONFIG_ARM_CMN=m
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
 CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
-# CONFIG_ARM_SMMU_QCOM_DEBUG is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
 CONFIG_ASN1=y
@ -3735,7 +3734,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
+CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@ -257,7 +257,6 @@ CONFIG_ARM_CMN=m
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
 CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
-# CONFIG_ARM_SMMU_QCOM_DEBUG is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
 CONFIG_ASN1=y
@ -3738,7 +3737,7 @@ CONFIG_N_GSM=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
+CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@ -257,7 +257,6 @@ CONFIG_ARM_CMN=m
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
 CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
-# CONFIG_ARM_SMMU_QCOM_DEBUG is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
 CONFIG_ASN1=y
@ -3718,7 +3717,7 @@ CONFIG_N_GSM=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
+CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@ -257,7 +257,6 @@ CONFIG_ARM_CMN=m
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
 CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
-# CONFIG_ARM_SMMU_QCOM_DEBUG is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
 CONFIG_ASN1=y
@ -3732,7 +3731,7 @@ CONFIG_N_GSM=y
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
+CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@ -280,7 +280,6 @@ CONFIG_ARM_CMN=m
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
 CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
-# CONFIG_ARM_SMMU_QCOM_DEBUG is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
 CONFIG_ASN1=y
@ -3929,7 +3928,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
+CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@ -280,7 +280,6 @@ CONFIG_ARM_CMN=m
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
 CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
-# CONFIG_ARM_SMMU_QCOM_DEBUG is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
 CONFIG_ASN1=y
@ -3909,7 +3908,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
+CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel.spec
+++ b/kernel.spec
@ -120,17 +120,17 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 # define buildid .local
 %define specversion 6.0.0
 %define patchversion 6.0
-%define pkgrelease 0.rc7.20220930git987a926c1d8a.51
+%define pkgrelease 54
 %define kversion 6
-%define tarfile_release 6.0-rc7-132-g987a926c1d8a
+%define tarfile_release 6.0
 # This is needed to do merge window version magic
 %define patchlevel 0
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.20220930git987a926c1d8a.51%{?buildid}%{?dist}
+%define specrelease 54%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.0.0

@ -3180,6 +3180,16 @@ fi
 #
 #
 %changelog
+* Mon Oct 03 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-54]
+- redhat/configs: Move CONFIG_ARM_SMMU_QCOM_DEBUG to common (Jerry Snitselaar)
+- Linux v6.0.0
+
+* Sun Oct 02 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc7.b357fd1c2afc.53]
+- Linux v6.0.0-0.rc7.b357fd1c2afc
+
+* Sat Oct 01 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc7.ffb4d94b4314.52]
+- Linux v6.0.0-0.rc7.ffb4d94b4314
+
 * Fri Sep 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc7.987a926c1d8a.51]
 - Common config cleanup for 6.0 (Justin M. Forbes)
 - Linux v6.0.0-0.rc7.987a926c1d8a
--- a/patch-6.0-redhat.patch
+++ b/patch-6.0-redhat.patch
@ -121,7 +121,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index 647a42a1f800..769b7c25a6a9 100644
+index 8478e13e9424..037381430a72 100644
 --- a/Makefile
 +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -1246,7 +1246,7 @@ index ee4da9ab8013..d395d11eadc4 100644
 	if (ret < 0)
 		goto err_allowedips;
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 66446f1e06cf..29fccce7ba4e 100644
+index 8d5a7ae19844..f3939183c346 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
@@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-6.0-rc7-132-g987a926c1d8a.tar.xz) = be67dc7133cf1e9216c638a7be68cb2613f3f314ca679a96067f077d65ae51b01636a5c417fbf3513e55dc4dd2147f2fc08378352df782a942541b3d5b113f0b
-SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 5fbe90d3ddd6b87af75a6e2c1d1c85bdf29bb5ca4a9c1e0e9075a406c21f1bf03df87aa32f116c2a7c101482aed977efbd05ac87883b51b1998faccb6f162a13
-SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 1c916e6d4f64ca4c12a4d1d69313899f7d03f32505cb8e436c9d57d47d3c147ac9c68c6d547db19c113988d6d619bb267a32b6aa71c7823a5c88f65f96203d72
+SHA512 (linux-6.0.tar.xz) = b0f06f089c2ff42b59038c14f3d2b26f2f5510eda13057261239a3cb8fdea0c114e76842dd9676ed4187820ac9af8018ef0d2ca18a4507a3bf3cd47c9aba7b56
+SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 92cb0b85f323a8816e606a0e35c932fbf619daadf2c4ac8ad6ad455a4c0d45c566ecda63d5ec4299fd214a02e5347e46d997786683cc249800c829843a9ba30b
+SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 4f5eed71b3a03d10c24766c78c3de0272e45bad0826ea020943d645855af4fc63b924e5a938e18d3cbe585a823d57ab0c3b3ec8ee1da23f7eb8d1973a2cd2441