From a7e8cc354231e442802a1077c5aeba59160ef909 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 11 Jun 2024 07:45:17 -0600 Subject: [PATCH] kernel-6.10.0-0.rc3.32 * Tue Jun 11 2024 Fedora Kernel Team [6.10.0-0.rc3.32] - gitlab-ci: do not merge ark-latest for gating pipelines for Rawhide (Michael Hofmann) - disable CONFIG_KVM_INTEL_PROVE_VE (Paolo Bonzini) - redhat: remove the merge subtrees script (Derek Barbosa) - redhat: rhdocs: delete .get_maintainer.conf (Derek Barbosa) - redhat: rhdocs: Remove the rhdocs directory (Derek Barbosa) - redhat/configs: Disable CONFIG_QLA3XXX (Kamal Heib) [RHEL-36646] Resolves: RHEL-36646 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 1 - kernel-aarch64-16k-fedora.config | 1 - kernel-aarch64-64k-debug-rhel.config | 3 +-- kernel-aarch64-64k-rhel.config | 3 +-- kernel-aarch64-debug-fedora.config | 1 - kernel-aarch64-debug-rhel.config | 3 +-- kernel-aarch64-fedora.config | 1 - kernel-aarch64-rhel.config | 3 +-- kernel-aarch64-rt-debug-rhel.config | 3 +-- kernel-aarch64-rt-rhel.config | 3 +-- kernel-ppc64le-debug-fedora.config | 1 - kernel-ppc64le-debug-rhel.config | 1 - kernel-ppc64le-fedora.config | 1 - kernel-ppc64le-rhel.config | 1 - kernel-s390x-debug-fedora.config | 1 - kernel-s390x-debug-rhel.config | 3 +-- kernel-s390x-fedora.config | 1 - kernel-s390x-rhel.config | 3 +-- kernel-s390x-zfcpdump-rhel.config | 3 +-- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-debug-rhel.config | 4 ++-- kernel-x86_64-fedora.config | 2 +- kernel-x86_64-rhel.config | 4 ++-- kernel-x86_64-rt-debug-rhel.config | 4 ++-- kernel-x86_64-rt-rhel.config | 4 ++-- kernel.changelog | 9 +++++++++ kernel.spec | 12 ++++++++++-- sources | 4 ++-- 29 files changed, 41 insertions(+), 43 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 1232f7a10..d737e5467 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 = 31 +RHEL_RELEASE = 32 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 1ef1462e5..539c0f6b4 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -4000,7 +4000,6 @@ CONFIG_KUNIT=m CONFIG_KUNIT_TEST=m # CONFIG_KUNPENG_HCCS is not set CONFIG_KUSER_HELPERS=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index f89965268..4f021fad1 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -3976,7 +3976,6 @@ CONFIG_KUNIT=m CONFIG_KUNIT_TEST=m # CONFIG_KUNPENG_HCCS is not set CONFIG_KUSER_HELPERS=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index bf9a62cca..463f071ff 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -3293,7 +3293,6 @@ CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_HYPERV=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y @@ -5174,7 +5173,7 @@ CONFIG_QED=m CONFIG_QED_SRIOV=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 4d0fab477..f523b5b91 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -3272,7 +3272,6 @@ CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_HYPERV=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y @@ -5151,7 +5150,7 @@ CONFIG_QED=m CONFIG_QED_SRIOV=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 552934c97..d9b541c38 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4000,7 +4000,6 @@ CONFIG_KUNIT=m CONFIG_KUNIT_TEST=m # CONFIG_KUNPENG_HCCS is not set CONFIG_KUSER_HELPERS=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index ef829d73f..9b2cd5733 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3290,7 +3290,6 @@ CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_HYPERV=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y @@ -5170,7 +5169,7 @@ CONFIG_QED=m CONFIG_QED_SRIOV=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index e9d817d68..54bedaed8 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3976,7 +3976,6 @@ CONFIG_KUNIT=m CONFIG_KUNIT_TEST=m # CONFIG_KUNPENG_HCCS is not set CONFIG_KUSER_HELPERS=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index eb235514b..b188c58ab 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3269,7 +3269,6 @@ CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_HYPERV=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y @@ -5147,7 +5146,7 @@ CONFIG_QED=m CONFIG_QED_SRIOV=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 35a027b78..d01a085f7 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -3330,7 +3330,6 @@ CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_HYPERV=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y @@ -5219,7 +5218,7 @@ CONFIG_QED=m CONFIG_QED_SRIOV=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 34ed732f7..54d8147df 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -3309,7 +3309,6 @@ CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_HYPERV=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y @@ -5196,7 +5195,7 @@ CONFIG_QED=m CONFIG_QED_SRIOV=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 1bca703cb..c1463c664 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -3233,7 +3233,6 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_GUEST=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 07c921b43..fe336fa12 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2978,7 +2978,6 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y CONFIG_KVM_BOOK3S_PR_POSSIBLE=y CONFIG_KVM_GUEST=y CONFIG_KVM_HYPERV=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index d075adc2b..324cc1dad 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -3207,7 +3207,6 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_GUEST=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index d9432c216..a5795f555 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2958,7 +2958,6 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y CONFIG_KVM_BOOK3S_PR_POSSIBLE=y CONFIG_KVM_GUEST=y CONFIG_KVM_HYPERV=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index c065f36b9..318eae01b 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3198,7 +3198,6 @@ CONFIG_KUNIT_EXAMPLE_TEST=m # CONFIG_KUNIT_FAULT_TEST is not set CONFIG_KUNIT=m CONFIG_KUNIT_TEST=m -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM=m CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index d70e1c8bf..17d4aa064 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2954,7 +2954,6 @@ CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_HYPERV=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM=m CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y @@ -4696,7 +4695,7 @@ CONFIG_QETH=m # CONFIG_QETH_OSX is not set # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index e5cbd581a..d80294b6b 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3172,7 +3172,6 @@ CONFIG_KUNIT_EXAMPLE_TEST=m # CONFIG_KUNIT_FAULT_TEST is not set CONFIG_KUNIT=m CONFIG_KUNIT_TEST=m -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM=m CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 7f8a497b2..b702de81c 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2934,7 +2934,6 @@ CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_HYPERV=y -CONFIG_KVM_INTEL_PROVE_VE=y CONFIG_KVM=m CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set @@ -4675,7 +4674,7 @@ CONFIG_QETH=m # CONFIG_QETH_OSX is not set # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 8939474b8..25fb7d3c2 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2942,7 +2942,6 @@ CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_HYPERV=y -CONFIG_KVM_INTEL_PROVE_VE=y # CONFIG_KVM is not set CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set @@ -4687,7 +4686,7 @@ CONFIG_QETH=m # CONFIG_QETH_OSX is not set # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index ed81001dd..48d467cf1 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3583,7 +3583,7 @@ CONFIG_KVM_AMD_SEV=y CONFIG_KVM_GUEST=y CONFIG_KVM_HYPERV=y CONFIG_KVM_INTEL=m -CONFIG_KVM_INTEL_PROVE_VE=y +# CONFIG_KVM_INTEL_PROVE_VE is not set CONFIG_KVM=m CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_MMU_AUDIT=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 95c627b8b..740439fc7 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3174,7 +3174,7 @@ CONFIG_KVM_AMD_SEV=y CONFIG_KVM_GUEST=y CONFIG_KVM_HYPERV=y CONFIG_KVM_INTEL=m -CONFIG_KVM_INTEL_PROVE_VE=y +# CONFIG_KVM_INTEL_PROVE_VE is not set CONFIG_KVM=m CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_MMU_AUDIT=y @@ -4983,7 +4983,7 @@ CONFIG_QED=m CONFIG_QED_SRIOV=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 6d9662a63..d8039ccc8 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3557,7 +3557,7 @@ CONFIG_KVM_AMD_SEV=y CONFIG_KVM_GUEST=y CONFIG_KVM_HYPERV=y CONFIG_KVM_INTEL=m -CONFIG_KVM_INTEL_PROVE_VE=y +# CONFIG_KVM_INTEL_PROVE_VE is not set CONFIG_KVM=m CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_MMU_AUDIT=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 9a2981b7a..2e872be94 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3154,7 +3154,7 @@ CONFIG_KVM_AMD_SEV=y CONFIG_KVM_GUEST=y CONFIG_KVM_HYPERV=y CONFIG_KVM_INTEL=m -CONFIG_KVM_INTEL_PROVE_VE=y +# CONFIG_KVM_INTEL_PROVE_VE is not set CONFIG_KVM=m CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_MMU_AUDIT=y @@ -4961,7 +4961,7 @@ CONFIG_QED=m CONFIG_QED_SRIOV=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 749d0294e..a5d0743aa 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3214,7 +3214,7 @@ CONFIG_KVM_AMD_SEV=y CONFIG_KVM_GUEST=y CONFIG_KVM_HYPERV=y CONFIG_KVM_INTEL=m -CONFIG_KVM_INTEL_PROVE_VE=y +# CONFIG_KVM_INTEL_PROVE_VE is not set CONFIG_KVM=m CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_MMU_AUDIT=y @@ -5032,7 +5032,7 @@ CONFIG_QED=m CONFIG_QED_SRIOV=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index b4883c3a6..2c96c4254 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3194,7 +3194,7 @@ CONFIG_KVM_AMD_SEV=y CONFIG_KVM_GUEST=y CONFIG_KVM_HYPERV=y CONFIG_KVM_INTEL=m -CONFIG_KVM_INTEL_PROVE_VE=y +# CONFIG_KVM_INTEL_PROVE_VE is not set CONFIG_KVM=m CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_MMU_AUDIT=y @@ -5010,7 +5010,7 @@ CONFIG_QED=m CONFIG_QED_SRIOV=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y -CONFIG_QLA3XXX=m +# CONFIG_QLA3XXX is not set # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_QNX4FS_FS is not set diff --git a/kernel.changelog b/kernel.changelog index 31fed72aa..82b4dd3ff 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,12 @@ +* Tue Jun 11 2024 Fedora Kernel Team [6.10.0-0.rc3.32] +- gitlab-ci: do not merge ark-latest for gating pipelines for Rawhide (Michael Hofmann) +- disable CONFIG_KVM_INTEL_PROVE_VE (Paolo Bonzini) +- redhat: remove the merge subtrees script (Derek Barbosa) +- redhat: rhdocs: delete .get_maintainer.conf (Derek Barbosa) +- redhat: rhdocs: Remove the rhdocs directory (Derek Barbosa) +- redhat/configs: Disable CONFIG_QLA3XXX (Kamal Heib) [RHEL-36646] +Resolves: RHEL-36646 + * Mon Jun 10 2024 Fedora Kernel Team [6.10.0-0.rc3.31] - Linux v6.10.0-0.rc3 Resolves: diff --git a/kernel.spec b/kernel.spec index 2d6cea602..4f4570bde 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.10.0 %define specversion 6.10.0 %define patchversion 6.10 -%define pkgrelease 0.rc3.31 +%define pkgrelease 0.rc3.32 %define kversion 6 %define tarfile_release 6.10-rc3 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.31%{?buildid}%{?dist} +%define specrelease 0.rc3.32%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -4018,6 +4018,14 @@ fi\ # # %changelog +* Tue Jun 11 2024 Fedora Kernel Team [6.10.0-0.rc3.32] +- gitlab-ci: do not merge ark-latest for gating pipelines for Rawhide (Michael Hofmann) +- disable CONFIG_KVM_INTEL_PROVE_VE (Paolo Bonzini) +- redhat: remove the merge subtrees script (Derek Barbosa) +- redhat: rhdocs: delete .get_maintainer.conf (Derek Barbosa) +- redhat: rhdocs: Remove the rhdocs directory (Derek Barbosa) +- redhat/configs: Disable CONFIG_QLA3XXX (Kamal Heib) [RHEL-36646] + * Mon Jun 10 2024 Fedora Kernel Team [6.10.0-0.rc3.31] - Linux v6.10.0-0.rc3 diff --git a/sources b/sources index 7943fbf6e..ca04e5e3f 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 SHA512 (linux-6.10-rc3.tar.xz) = 37dd448c6f0a17b5377da3520133e7077f07cf44ebddbde4c1b114a8650f9cda266846cf8bbdcf0bbccfe78d224f1d320629c71f540f602416aa3bae4d2a837d -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = cd8a1ca002f967d578dec21f1d06d17f9fc307ac7501c4da170265ca590550617512107a4776e134cb1a9e826ed6dbe4952b67229602e5fe35344091c52ffeb5 -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 886dc1624a5a06821f6ddd2b4f94acb142408b115a49c2db266106d6b9255f282b314c03f531556cd5bbc383dbe50d2f6f2054f5fe94ec48df3d2c4d93c9423e +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 8c23c7830796f294f0a042e40c5477e1799902646b4f2bea8452a17e5f3515db055c3ae875dc8aaaba79224b747e3ec6294e060e1d51b4e80e5e14e9754a8a47 +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 97681d366baa27792f2637564b2baf28f111036ce5b205c82a43aad09dacc770996460d8106a053b459b19568fdac251bdafce83ba0ec0b2317d82f8bccfaf1b