diff --git a/Makefile.rhelver b/Makefile.rhelver index 66dd6c7e7..750e0c0ab 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 = 33 +RHEL_RELEASE = 34 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 870bb525c..d6db15627 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -402,7 +402,10 @@ CONFIG_ARM_MHU=m # CONFIG_ARM_PL172_MPMC is not set CONFIG_ARM_PMU=y # CONFIG_ARM_PSCI_CHECKER is not set -# CONFIG_ARM_PSCI_CPUIDLE is not set +CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_ARM_PSCI_FW=y +CONFIG_ARM_PSCI=y # CONFIG_ARM_QCOM_CPUFREQ_HW is not set CONFIG_ARM_SBSA_WATCHDOG=m CONFIG_ARM_SCMI_CPUFREQ=m diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index f9e5f96b5..9c5b055b5 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -402,7 +402,10 @@ CONFIG_ARM_MHU=m # CONFIG_ARM_PL172_MPMC is not set CONFIG_ARM_PMU=y # CONFIG_ARM_PSCI_CHECKER is not set -# CONFIG_ARM_PSCI_CPUIDLE is not set +CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_ARM_PSCI_FW=y +CONFIG_ARM_PSCI=y # CONFIG_ARM_QCOM_CPUFREQ_HW is not set CONFIG_ARM_SBSA_WATCHDOG=m CONFIG_ARM_SCMI_CPUFREQ=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index c5d7daa71..1d74ded39 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -400,7 +400,10 @@ CONFIG_ARM_MHU=m # CONFIG_ARM_PL172_MPMC is not set CONFIG_ARM_PMU=y # CONFIG_ARM_PSCI_CHECKER is not set -# CONFIG_ARM_PSCI_CPUIDLE is not set +CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_ARM_PSCI_FW=y +CONFIG_ARM_PSCI=y # CONFIG_ARM_QCOM_CPUFREQ_HW is not set CONFIG_ARM_SBSA_WATCHDOG=m CONFIG_ARM_SCMI_CPUFREQ=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 2b9423bb7..9101d6011 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -400,7 +400,10 @@ CONFIG_ARM_MHU=m # CONFIG_ARM_PL172_MPMC is not set CONFIG_ARM_PMU=y # CONFIG_ARM_PSCI_CHECKER is not set -# CONFIG_ARM_PSCI_CPUIDLE is not set +CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_ARM_PSCI_FW=y +CONFIG_ARM_PSCI=y # CONFIG_ARM_QCOM_CPUFREQ_HW is not set CONFIG_ARM_SBSA_WATCHDOG=m CONFIG_ARM_SCMI_CPUFREQ=m diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 8e1771ef5..977f60d76 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -400,7 +400,10 @@ CONFIG_ARM_MHU=m # CONFIG_ARM_PL172_MPMC is not set CONFIG_ARM_PMU=y # CONFIG_ARM_PSCI_CHECKER is not set -# CONFIG_ARM_PSCI_CPUIDLE is not set +CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_ARM_PSCI_FW=y +CONFIG_ARM_PSCI=y # CONFIG_ARM_QCOM_CPUFREQ_HW is not set CONFIG_ARM_SBSA_WATCHDOG=m CONFIG_ARM_SCMI_CPUFREQ=m diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index a89614fd9..8e9e31a9e 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -400,7 +400,10 @@ CONFIG_ARM_MHU=m # CONFIG_ARM_PL172_MPMC is not set CONFIG_ARM_PMU=y # CONFIG_ARM_PSCI_CHECKER is not set -# CONFIG_ARM_PSCI_CPUIDLE is not set +CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_ARM_PSCI_FW=y +CONFIG_ARM_PSCI=y # CONFIG_ARM_QCOM_CPUFREQ_HW is not set CONFIG_ARM_SBSA_WATCHDOG=m CONFIG_ARM_SCMI_CPUFREQ=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 5c909a83e..c56f7a558 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -302,7 +302,6 @@ CONFIG_ARM64_ERRATUM_2253138=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set -CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y CONFIG_ARM_PTDUMP_DEBUGFS=y # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index fd9b750ef..8c0108563 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1240,9 +1240,8 @@ CONFIG_DEVTMPFS=y # CONFIG_DHT11 is not set CONFIG_DIMLIB=y # CONFIG_DLHL60D is not set -CONFIG_DLM_DEBUG=y # CONFIG_DLM_DEPRECATED_API is not set -CONFIG_DLM=m +# CONFIG_DLM is not set # CONFIG_DM9051 is not set CONFIG_DMA_API_DEBUG_SG=y CONFIG_DMA_API_DEBUG=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 45a7ba323..82357bccf 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -302,7 +302,6 @@ CONFIG_ARM64_ERRATUM_2253138=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set -CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index a5326fc92..5083d6feb 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1232,9 +1232,8 @@ CONFIG_DEVTMPFS=y # CONFIG_DHT11 is not set CONFIG_DIMLIB=y # CONFIG_DLHL60D is not set -CONFIG_DLM_DEBUG=y # CONFIG_DLM_DEPRECATED_API is not set -CONFIG_DLM=m +# CONFIG_DLM is not set # CONFIG_DM9051 is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_API_DEBUG_SG is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 181d6e966..9e6c650c1 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -307,7 +307,6 @@ CONFIG_ARM64_ERRATUM_2253138=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set -CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y CONFIG_ARM_PTDUMP_DEBUGFS=y # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index a0ab1cc61..45d6cb81b 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1242,9 +1242,8 @@ CONFIG_DEVTMPFS=y CONFIG_DIAG288_WATCHDOG=m CONFIG_DIMLIB=y # CONFIG_DLHL60D is not set -CONFIG_DLM_DEBUG=y # CONFIG_DLM_DEPRECATED_API is not set -CONFIG_DLM=m +# CONFIG_DLM is not set # CONFIG_DM9051 is not set CONFIG_DMA_API_DEBUG_SG=y CONFIG_DMA_API_DEBUG=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 569a0235d..c7ef1f293 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -307,7 +307,6 @@ CONFIG_ARM64_ERRATUM_2253138=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set -CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index ecc14ee34..4914e7562 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1234,9 +1234,8 @@ CONFIG_DEVTMPFS=y CONFIG_DIAG288_WATCHDOG=m CONFIG_DIMLIB=y # CONFIG_DLHL60D is not set -CONFIG_DLM_DEBUG=y # CONFIG_DLM_DEPRECATED_API is not set -CONFIG_DLM=m +# CONFIG_DLM is not set # CONFIG_DM9051 is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_API_DEBUG_SG is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index a4bbe1674..c6a973c88 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1235,9 +1235,8 @@ CONFIG_DEVTMPFS=y CONFIG_DIAG288_WATCHDOG=m CONFIG_DIMLIB=y # CONFIG_DLHL60D is not set -CONFIG_DLM_DEBUG=y # CONFIG_DLM_DEPRECATED_API is not set -CONFIG_DLM=m +# CONFIG_DLM is not set # CONFIG_DM9051 is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_API_DEBUG_SG is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 632091fe4..99f3fb34a 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -345,7 +345,6 @@ CONFIG_ARM64_ERRATUM_2253138=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set -CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y CONFIG_ARM_PTDUMP_DEBUGFS=y # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 3f3a61115..9ec762498 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1315,9 +1315,8 @@ CONFIG_DEVTMPFS=y CONFIG_DIMLIB=y CONFIG_DL2K=m # CONFIG_DLHL60D is not set -CONFIG_DLM_DEBUG=y # CONFIG_DLM_DEPRECATED_API is not set -CONFIG_DLM=m +# CONFIG_DLM is not set # CONFIG_DM9051 is not set CONFIG_DMA_API_DEBUG_SG=y CONFIG_DMA_API_DEBUG=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index b7186a316..61e8d3545 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -345,7 +345,6 @@ CONFIG_ARM64_ERRATUM_2253138=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set -CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index dd56ec91d..44403b1f7 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1307,9 +1307,8 @@ CONFIG_DEVTMPFS=y CONFIG_DIMLIB=y CONFIG_DL2K=m # CONFIG_DLHL60D is not set -CONFIG_DLM_DEBUG=y # CONFIG_DLM_DEPRECATED_API is not set -CONFIG_DLM=m +# CONFIG_DLM is not set # CONFIG_DM9051 is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_API_DEBUG_SG is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 9b92e61a4..c23791a89 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -1317,9 +1317,8 @@ CONFIG_DEVTMPFS=y CONFIG_DIMLIB=y CONFIG_DL2K=m # CONFIG_DLHL60D is not set -CONFIG_DLM_DEBUG=y # CONFIG_DLM_DEPRECATED_API is not set -CONFIG_DLM=m +# CONFIG_DLM is not set # CONFIG_DM9051 is not set CONFIG_DMA_API_DEBUG_SG=y CONFIG_DMA_API_DEBUG=y diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 5752fb017..e8328a9a7 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -1309,9 +1309,8 @@ CONFIG_DEVTMPFS=y CONFIG_DIMLIB=y CONFIG_DL2K=m # CONFIG_DLHL60D is not set -CONFIG_DLM_DEBUG=y # CONFIG_DLM_DEPRECATED_API is not set -CONFIG_DLM=m +# CONFIG_DLM is not set # CONFIG_DM9051 is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_API_DEBUG_SG is not set diff --git a/kernel.changelog b/kernel.changelog index 25eebbf06..fdccbf5d5 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,13 @@ -* Thu Aug 15 2024 Fedora Kernel Team [6.11.0-0.rc3.1fb918967b56.33] +* Fri Aug 16 2024 Fedora Kernel Team [6.11.0-0.rc3.d7a5aa4b3c00.34] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) Resolves: +* Fri Aug 16 2024 Fedora Kernel Team [6.11.0-0.rc3.d7a5aa4b3c00.33] +- redhat/configs: Disable dlm in rhel configs (Andrew Price) +- rhel: aarch64: enable required PSCI configs (Peter Robinson) +- Linux v6.11.0-0.rc3.d7a5aa4b3c00 +Resolves: + * Thu Aug 15 2024 Fedora Kernel Team [6.11.0-0.rc3.1fb918967b56.32] - Linux v6.11.0-0.rc3.1fb918967b56 Resolves: diff --git a/kernel.spec b/kernel.spec index 54062724d..7a11075df 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc3.20240815git1fb918967b56.33 +%define pkgrelease 0.rc3.20240816gitd7a5aa4b3c00.34 %define kversion 6 -%define tarfile_release 6.11-rc3-66-g1fb918967b56 +%define tarfile_release 6.11-rc3-156-gd7a5aa4b3c00 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20240815git1fb918967b56.33%{?buildid}%{?dist} +%define specrelease 0.rc3.20240816gitd7a5aa4b3c00.34%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4097,9 +4097,14 @@ fi\ # # %changelog -* Thu Aug 15 2024 Fedora Kernel Team [6.11.0-0.rc3.1fb918967b56.33] +* Fri Aug 16 2024 Fedora Kernel Team [6.11.0-0.rc3.d7a5aa4b3c00.34] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) +* Fri Aug 16 2024 Fedora Kernel Team [6.11.0-0.rc3.d7a5aa4b3c00.33] +- redhat/configs: Disable dlm in rhel configs (Andrew Price) +- rhel: aarch64: enable required PSCI configs (Peter Robinson) +- Linux v6.11.0-0.rc3.d7a5aa4b3c00 + * Thu Aug 15 2024 Fedora Kernel Team [6.11.0-0.rc3.1fb918967b56.32] - Linux v6.11.0-0.rc3.1fb918967b56 diff --git a/sources b/sources index 0a0abd896..ca7b23dfa 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc3-66-g1fb918967b56.tar.xz) = 942b6f6b8b2f20c58e8bd429dfcd5adacee070c5def6d12f58e147504ebccfdc8021725145e3b66342a7e0e7a80f02302b801512d94b125a63e4ee463d06b06f -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 87ec830de6de2222f5daf9d8a6855b26578c6b3a97b4a9279d9c9a520bb2bffd3d3af4f42a2445f25d67c908f6dc4e5f811182a7c34a446b5c2c64ea537d1b22 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = b9670603977085c9b00565dcf1df6d25db52d507e12705d79f2581c1f709f248bb77a2cc3ac9c4f08c99132b70e08d0e7594cde5cbe83123bc077a683cd8e78e +SHA512 (linux-6.11-rc3-156-gd7a5aa4b3c00.tar.xz) = d45b75cc06339f5b423f8930a88ca5004933d417d3938f8159d7ad68d8b25a1062531c5041a107a4388bf1962433708e757d552f90a4a069630d910d3a707486 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 6dd8fdfe2c90ac23e9f809912b1466e70a91ec3fb8ed35f5218b5368e580a839dae74c900180f3b5b158db7dd9626c829f620ccd5ee3ca48851df99f23f1f8df +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = ab11eb70b0fa046a4ce50bc6ecf4a3f650969a8b7f5d15ee41ee8f592b3d6d138959b1fd2a1edc288b9ed7e42068b095ff3f8bff17d571fbe8c329e94fefd682