From 2dfd3ab5455da79994a5afde004f0f9b886e6008 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 15 May 2023 07:53:19 -0500 Subject: [PATCH] kernel-6.4.0-0.rc2.23 * Mon May 15 2023 Fedora Kernel Team [6.4.0-0.rc2.23] - redhat/configs: Fix incorrect configs location and content (Vladis Dronov) - redhat/configs: turn on CONFIG_MARVELL_CN10K_DDR_PMU (Michal Schmidt) [2042241] - Linux v6.4.0-0.rc2 Resolves: rhbz#2042241 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-debug-rhel.config | 3 ++- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rhel.config | 3 ++- kernel-ppc64le-debug-fedora.config | 1 + kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-fedora.config | 1 + kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-fedora.config | 1 + kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-fedora.config | 1 + kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-fedora.config | 1 + kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-fedora.config | 1 + kernel-x86_64-rhel.config | 2 +- kernel.spec | 20 +++++++++++++++++--- patch-6.4-redhat.patch | 2 +- sources | 6 +++--- 21 files changed, 41 insertions(+), 19 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 3554f91af..c9670fb00 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 = 19 +RHEL_RELEASE = 23 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index c9094c8ab..15beeba6e 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3989,7 +3989,7 @@ CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m -# CONFIG_MARVELL_CN10K_DDR_PMU is not set +CONFIG_MARVELL_CN10K_DDR_PMU=m CONFIG_MARVELL_CN10K_TAD_PMU=m CONFIG_MARVELL_PHY=m # CONFIG_MATOM is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 6f810c831..8f940ea6c 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3179,7 +3179,7 @@ CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m # CONFIG_MARVELL_88X2222_PHY is not set -# CONFIG_MARVELL_CN10K_DDR_PMU is not set +CONFIG_MARVELL_CN10K_DDR_PMU=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set CONFIG_MARVELL_PHY=m # CONFIG_MATOM is not set @@ -3331,6 +3331,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index a4fb34c2f..006d01870 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3965,7 +3965,7 @@ CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m -# CONFIG_MARVELL_CN10K_DDR_PMU is not set +CONFIG_MARVELL_CN10K_DDR_PMU=m CONFIG_MARVELL_CN10K_TAD_PMU=m CONFIG_MARVELL_PHY=m # CONFIG_MATOM is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index bcc22eaf3..b3dd593c0 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3158,7 +3158,7 @@ CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m # CONFIG_MARVELL_88X2222_PHY is not set -# CONFIG_MARVELL_CN10K_DDR_PMU is not set +CONFIG_MARVELL_CN10K_DDR_PMU=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set CONFIG_MARVELL_PHY=m # CONFIG_MATOM is not set @@ -3310,6 +3310,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 3fa357d5f..cd535a694 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -3467,6 +3467,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 120982ea6..06fefa451 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2966,7 +2966,6 @@ CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m # CONFIG_MARVELL_88X2222_PHY is not set -# CONFIG_MARVELL_CN10K_DDR_PMU is not set # CONFIG_MARVELL_CN10K_TAD_PMU is not set CONFIG_MARVELL_PHY=m # CONFIG_MATOM is not set @@ -3113,6 +3112,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index d765806a5..f793a20fa 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -3440,6 +3440,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index d8ef3b396..7484339a7 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2946,7 +2946,6 @@ CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m # CONFIG_MARVELL_88X2222_PHY is not set -# CONFIG_MARVELL_CN10K_DDR_PMU is not set # CONFIG_MARVELL_CN10K_TAD_PMU is not set CONFIG_MARVELL_PHY=m # CONFIG_MATOM is not set @@ -3093,6 +3092,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 899af9912..a97442cfe 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3448,6 +3448,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index ed176caac..e589c7237 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2954,7 +2954,6 @@ CONFIG_MARCH_Z14=y # CONFIG_MARCH_ZEC12 is not set CONFIG_MARVELL_10G_PHY=m # CONFIG_MARVELL_88X2222_PHY is not set -# CONFIG_MARVELL_CN10K_DDR_PMU is not set # CONFIG_MARVELL_CN10K_TAD_PMU is not set # CONFIG_MARVELL_PHY is not set # CONFIG_MATOM is not set @@ -3100,6 +3099,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index d1410940c..f16881e90 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3421,6 +3421,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index e0deba7d9..f3669e7cc 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2934,7 +2934,6 @@ CONFIG_MARCH_Z14=y # CONFIG_MARCH_ZEC12 is not set CONFIG_MARVELL_10G_PHY=m # CONFIG_MARVELL_88X2222_PHY is not set -# CONFIG_MARVELL_CN10K_DDR_PMU is not set # CONFIG_MARVELL_CN10K_TAD_PMU is not set # CONFIG_MARVELL_PHY is not set # CONFIG_MATOM is not set @@ -3080,6 +3079,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 2a087d500..ed8b3272c 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2946,7 +2946,6 @@ CONFIG_MARCH_Z14=y # CONFIG_MARCH_ZEC12 is not set CONFIG_MARVELL_10G_PHY=m # CONFIG_MARVELL_88X2222_PHY is not set -# CONFIG_MARVELL_CN10K_DDR_PMU is not set # CONFIG_MARVELL_CN10K_TAD_PMU is not set # CONFIG_MARVELL_PHY is not set # CONFIG_MATOM is not set @@ -3092,6 +3091,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 9d8245f7e..6bad61c78 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3760,6 +3760,7 @@ CONFIG_MFD_INTEL_PMC_BXT=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index b2fa64cc1..ab5735ff6 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3137,7 +3137,6 @@ CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m # CONFIG_MARVELL_88X2222_PHY is not set -# CONFIG_MARVELL_CN10K_DDR_PMU is not set # CONFIG_MARVELL_CN10K_TAD_PMU is not set CONFIG_MARVELL_PHY=m # CONFIG_MATOM is not set @@ -3287,6 +3286,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index a27e866b1..69468d9a0 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3734,6 +3734,7 @@ CONFIG_MFD_INTEL_PMC_BXT=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 725c87950..673520438 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3117,7 +3117,6 @@ CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m # CONFIG_MARVELL_88X2222_PHY is not set -# CONFIG_MARVELL_CN10K_DDR_PMU is not set # CONFIG_MARVELL_CN10K_TAD_PMU is not set CONFIG_MARVELL_PHY=m # CONFIG_MATOM is not set @@ -3267,6 +3266,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_KHADAS_MCU is not set # CONFIG_MFD_LM3533 is not set # CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_LP3943 is not set diff --git a/kernel.spec b/kernel.spec index 4404a24d5..4ba027e4a 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.rc1.20230511git80e62bc8487b.19 +%define pkgrelease 0.rc2.23 %define kversion 6 -%define tarfile_release 6.4-rc1-26-g80e62bc8487b +%define tarfile_release 6.4-rc2 # This is needed to do merge window version magic %define patchlevel 4 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20230511git80e62bc8487b.19%{?buildid}%{?dist} +%define specrelease 0.rc2.23%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.4.0 @@ -3410,6 +3410,20 @@ fi # # %changelog +* Mon May 15 2023 Fedora Kernel Team [6.4.0-0.rc2.23] +- redhat/configs: Fix incorrect configs location and content (Vladis Dronov) +- redhat/configs: turn on CONFIG_MARVELL_CN10K_DDR_PMU (Michal Schmidt) [2042241] +- Linux v6.4.0-0.rc2 + +* Sun May 14 2023 Fedora Kernel Team [6.4.0-0.rc1.bb7c241fae62.22] +- Linux v6.4.0-0.rc1.bb7c241fae62 + +* Sat May 13 2023 Fedora Kernel Team [6.4.0-0.rc1.9a48d6046722.21] +- Linux v6.4.0-0.rc1.9a48d6046722 + +* Fri May 12 2023 Fedora Kernel Team [6.4.0-0.rc1.cc3c44c9fda2.20] +- Linux v6.4.0-0.rc1.cc3c44c9fda2 + * Thu May 11 2023 Fedora Kernel Team [6.4.0-0.rc1.80e62bc8487b.19] - redhat: configs: generic: x86: Disable CONFIG_VIDEO_OV2740 for x86 platform (Kate Hsuan) - Linux v6.4.0-0.rc1.80e62bc8487b diff --git a/patch-6.4-redhat.patch b/patch-6.4-redhat.patch index 635886f4e..6d39c4fbb 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 9d765ebcccf1..3c4b4754e450 100644 +index f836936fb4d8..0e546f04deab 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 00132b040..d0c2b456a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.4-rc1-26-g80e62bc8487b.tar.xz) = b263193b17a1a152d766a8294b05c851393c584a9b38641627ee5b085b617f76983bddcfa214766a7d2590442571ce7f2c466588d7bc8f45ff8c1f0f1fb91816 -SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = fff8328802967f1312494fa52e9938430559062bb1defae2516c2571489275a5498a45ee2f43d1ab0c40d0278021305fa8017131532c73db063b744db3d7396f -SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = cb219f6bed2d54fdb4a55c74aef8792b94adc27ce39e30cf128b74e88b15672e70e9e49eb97dd16f14c438a7d7273c9562e9dafe2ab67e4a7caa4de350b5b343 +SHA512 (linux-6.4-rc2.tar.xz) = ddea6ea4e57ce1d4ba526148be5e51338b350626974f082520a937235670fcc529e01ec6d7078ad1989b920a368ed8f4ca9d932f315c188f77aa6e6e016cc40f +SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 843e84d78732d9aab8360c2c4df6460a5e6f5b74352f87edca6cd1dd2548ac4867681860769faa33c1ce2f9ce5e7bc3a8e2ededbb409cb4534715d66efd5687b +SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 49bc80226d890eedf439c03a16126aa0ed97206f92b4d421535fe842a6f6b0dc1455915480ead42d0c0bbcfc0445a2980789763730ca59908182d8f73128e1e5