diff --git a/Makefile.rhelver b/Makefile.rhelver index 4ef64a680..66dd6c7e7 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 = 20 +RHEL_RELEASE = 33 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 96fbfe28a..0339f82fb 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,6 +1,3 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/0d1c1cce5327e44d9f59c34357278da9e95fa3cd - 0d1c1cce5327e44d9f59c34357278da9e95fa3cd blk-throttle: Fix incorrect display of io.max - https://gitlab.com/cki-project/kernel-ark/-/commit/6b58b8c1db5679fc8f0bba7d494431cdde1ca696 6b58b8c1db5679fc8f0bba7d494431cdde1ca696 rh_flags: Rename rh_features to rh_flags diff --git a/fedoraimaca.x509 b/fedoraimaca.x509 new file mode 100644 index 000000000..f75acb694 Binary files /dev/null and b/fedoraimaca.x509 differ diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 1352d657c..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 @@ -4492,7 +4491,7 @@ CONFIG_MFD_MAX77714=m # CONFIG_MFD_PALMAS is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_PM8XXX is not set -# CONFIG_MFD_QCOM_PM8008 is not set +CONFIG_MFD_QCOM_PM8008=m # CONFIG_MFD_QCOM_RPM is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RDC321X is not set @@ -4985,7 +4984,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_GATE=m CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m CONFIG_NET_ACT_NAT=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index e08442488..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 @@ -4467,7 +4466,7 @@ CONFIG_MFD_MAX77714=m # CONFIG_MFD_PALMAS is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_PM8XXX is not set -# CONFIG_MFD_QCOM_PM8008 is not set +CONFIG_MFD_QCOM_PM8008=m # CONFIG_MFD_QCOM_RPM is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RDC321X is not set @@ -4959,7 +4958,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_GATE=m CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m CONFIG_NET_ACT_NAT=m diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 2699e14cf..463f071ff 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -600,7 +600,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -4109,7 +4108,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -5175,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 4500a8913..f523b5b91 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -600,7 +600,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -4088,7 +4087,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -5152,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 ae4681c9d..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 @@ -4492,7 +4491,7 @@ CONFIG_MFD_MAX77714=m # CONFIG_MFD_PALMAS is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_PM8XXX is not set -# CONFIG_MFD_QCOM_PM8008 is not set +CONFIG_MFD_QCOM_PM8008=m # CONFIG_MFD_QCOM_RPM is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RDC321X is not set @@ -4985,7 +4984,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_GATE=m CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m CONFIG_NET_ACT_NAT=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 9352ae297..9b2cd5733 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -598,7 +598,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -4106,7 +4105,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -5171,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 6df69b638..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 @@ -4467,7 +4466,7 @@ CONFIG_MFD_MAX77714=m # CONFIG_MFD_PALMAS is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_PM8XXX is not set -# CONFIG_MFD_QCOM_PM8008 is not set +CONFIG_MFD_QCOM_PM8008=m # CONFIG_MFD_QCOM_RPM is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RDC321X is not set @@ -4959,7 +4958,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_GATE=m CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m CONFIG_NET_ACT_NAT=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 28b3f9dab..b188c58ab 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -598,7 +598,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -4085,7 +4084,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -5148,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 5fd18067a..d01a085f7 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -598,7 +598,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -4151,7 +4150,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -5220,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 f0dfe47a5..54d8147df 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -598,7 +598,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -4130,7 +4129,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -5197,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 c0345ebdd..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 @@ -4104,7 +4103,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_GATE=m CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m CONFIG_NET_ACT_NAT=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 5a8a7f159..fe336fa12 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -454,7 +454,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -3763,7 +3762,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 426dcc9bd..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 @@ -4076,7 +4075,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_GATE=m CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m CONFIG_NET_ACT_NAT=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 1788a7239..a5795f555 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -454,7 +454,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -3743,7 +3742,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index d1cca13b2..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 @@ -4074,7 +4073,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_GATE=m CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m CONFIG_NET_ACT_NAT=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index be63f1bbe..17d4aa064 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -453,7 +453,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -3743,7 +3742,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -4697,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 634e16d51..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 @@ -4046,7 +4045,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_GATE=m CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m CONFIG_NET_ACT_NAT=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 198fd1fd5..b702de81c 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -453,7 +453,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -3723,7 +3722,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -4676,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 b19ea8141..25fb7d3c2 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -454,7 +454,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -3732,7 +3731,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -4688,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 4360fa0eb..48d467cf1 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3113,7 +3113,8 @@ CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_TXE=m -# CONFIG_INTEL_MEI_VSC_HW is not set +CONFIG_INTEL_MEI_VSC_HW=m +CONFIG_INTEL_MEI_VSC=m CONFIG_INTEL_MEI_WDT=m CONFIG_INTEL_MRFLD_ADC=m CONFIG_INTEL_MRFLD_PWRBTN=m @@ -3160,7 +3161,7 @@ CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_TXT=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m CONFIG_INTEL_VBTN=m -# CONFIG_INTEL_VSC is not set +CONFIG_INTEL_VSC=m CONFIG_INTEL_VSEC=m CONFIG_INTEL_WMI_SBL_FW_UPDATE=m CONFIG_INTEL_WMI_THUNDERBOLT=m @@ -3582,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 @@ -4496,7 +4497,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_GATE=m CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m CONFIG_NET_ACT_NAT=m @@ -8541,7 +8541,7 @@ CONFIG_VIDEO_MT9V032=m CONFIG_VIDEO_MT9V111=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_OG01A1B=m -# CONFIG_VIDEO_OV01A10 is not set +CONFIG_VIDEO_OV01A10=m CONFIG_VIDEO_OV02A10=m CONFIG_VIDEO_OV08D10=m CONFIG_VIDEO_OV08X40=m @@ -8551,7 +8551,7 @@ CONFIG_VIDEO_OV2640=m CONFIG_VIDEO_OV2659=m CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV2685=m -# CONFIG_VIDEO_OV2740 is not set +CONFIG_VIDEO_OV2740=m CONFIG_VIDEO_OV4689=m CONFIG_VIDEO_OV5640=m CONFIG_VIDEO_OV5645=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index d614de8f1..740439fc7 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -482,7 +482,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -3984,7 +3984,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -4984,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 abe34f238..d8039ccc8 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3093,7 +3093,8 @@ CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_TXE=m -# CONFIG_INTEL_MEI_VSC_HW is not set +CONFIG_INTEL_MEI_VSC_HW=m +CONFIG_INTEL_MEI_VSC=m CONFIG_INTEL_MEI_WDT=m CONFIG_INTEL_MRFLD_ADC=m CONFIG_INTEL_MRFLD_PWRBTN=m @@ -3140,7 +3141,7 @@ CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_TXT=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m CONFIG_INTEL_VBTN=m -# CONFIG_INTEL_VSC is not set +CONFIG_INTEL_VSC=m CONFIG_INTEL_VSEC=m CONFIG_INTEL_WMI_SBL_FW_UPDATE=m CONFIG_INTEL_WMI_THUNDERBOLT=m @@ -3556,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 @@ -4470,7 +4471,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_GATE=m CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m CONFIG_NET_ACT_NAT=m @@ -8511,7 +8511,7 @@ CONFIG_VIDEO_MT9V032=m CONFIG_VIDEO_MT9V111=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_OG01A1B=m -# CONFIG_VIDEO_OV01A10 is not set +CONFIG_VIDEO_OV01A10=m CONFIG_VIDEO_OV02A10=m CONFIG_VIDEO_OV08D10=m CONFIG_VIDEO_OV08X40=m @@ -8521,7 +8521,7 @@ CONFIG_VIDEO_OV2640=m CONFIG_VIDEO_OV2659=m CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV2685=m -# CONFIG_VIDEO_OV2740 is not set +CONFIG_VIDEO_OV2740=m CONFIG_VIDEO_OV4689=m CONFIG_VIDEO_OV5640=m CONFIG_VIDEO_OV5645=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 871c87756..2e872be94 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -482,7 +482,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -3964,7 +3964,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -4962,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 a2fe8cce3..a5d0743aa 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -482,7 +482,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -4029,7 +4029,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -5033,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 1691ad6e9..2c96c4254 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -482,7 +482,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y @@ -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 @@ -4009,7 +4009,6 @@ CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set # CONFIG_NET_ACT_IFE is not set -# CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set @@ -5011,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 b216492f5..84d229b1a 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,68 @@ +* Wed Jun 12 2024 Fedora Kernel Team [6.10.0-0.rc3.2ef5971ff345.33] +- gitlab-ci: merge ark-latest before tagging cki-gating (Michael Hofmann) +- Linux v6.10.0-0.rc3.2ef5971ff345 +Resolves: + +* 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: + +* Sun Jun 09 2024 Fedora Kernel Team [6.10.0-0.rc2.771ed66105de.30] +- redhat/configs: fedora: Enable some drivers for IPU6 support (Hans de Goede) +- Linux v6.10.0-0.rc2.771ed66105de +Resolves: + +* Sat Jun 08 2024 Fedora Kernel Team [6.10.0-0.rc2.dc772f8237f9.29] +- Linux v6.10.0-0.rc2.dc772f8237f9 +Resolves: + +* Fri Jun 07 2024 Fedora Kernel Team [6.10.0-0.rc2.8a92980606e3.28] +- Linux v6.10.0-0.rc2.8a92980606e3 +Resolves: + +* Thu Jun 06 2024 Fedora Kernel Team [6.10.0-0.rc2.2df0193e62cf.27] +- redhat: add missing UKI_secureboot_cert hunk (Patrick Talbert) +- Linux v6.10.0-0.rc2.2df0193e62cf +Resolves: + +* Wed Jun 05 2024 Fedora Kernel Team [6.10.0-0.rc2.32f88d65f01b.26] +- redhat/kernel.spec: keep extra modules in original directories (Jan Stancek) +- Linux v6.10.0-0.rc2.32f88d65f01b +Resolves: + +* Tue Jun 04 2024 Fedora Kernel Team [6.10.0-0.rc2.2ab795141095.25] +- redhat/configs: Move CONFIG_BLK_CGROUP_IOCOST=y to common/generic (Waiman Long) +- Turn on CONFIG_MFD_QCOM_PM8008 for Fedora aarch64 (Justin M. Forbes) +- Linux v6.10.0-0.rc2.2ab795141095 +Resolves: + +* Mon Jun 03 2024 Fedora Kernel Team [6.10.0-0.rc2.24] +- Linux v6.10.0-0.rc2 +Resolves: + +* Sun Jun 02 2024 Fedora Kernel Team [6.10.0-0.rc1.83814698cf48.23] +- Linux v6.10.0-0.rc1.83814698cf48 +Resolves: + +* Sat Jun 01 2024 Fedora Kernel Team [6.10.0-0.rc1.cc8ed4d0a848.22] +- Linux v6.10.0-0.rc1.cc8ed4d0a848 +Resolves: + +* Fri May 31 2024 Fedora Kernel Team [6.10.0-0.rc1.4a4be1ad3a6e.21] +- redhat: Build IMA CA certificate into the Fedora kernel (Coiby Xu) +- Move CONFIG_RAS_FMPM to the proper location (Aristeu Rozanski) +- redhat/configs: Remove CONFIG_NET_ACT_IPT (Ivan Vecera) +Resolves: + * Thu May 30 2024 Fedora Kernel Team [6.10.0-0.rc1.4a4be1ad3a6e.20] - Linux v6.10.0-0.rc1.4a4be1ad3a6e Resolves: diff --git a/kernel.spec b/kernel.spec index 1e4c7982c..4cb8b1012 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.rc1.20240530git4a4be1ad3a6e.20 +%define pkgrelease 0.rc3.20240612git2ef5971ff345.33 %define kversion 6 -%define tarfile_release 6.10-rc1-27-g4a4be1ad3a6e +%define tarfile_release 6.10-rc3-21-g2ef5971ff345 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20240530git4a4be1ad3a6e.20%{?buildid}%{?dist} +%define specrelease 0.rc3.20240612git2ef5971ff345.33%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -929,6 +929,16 @@ Source102: nvidiagpuoot001.x509 Source103: rhelimaca1.x509 Source104: rhelima.x509 Source105: rhelima_centos.x509 +Source106: fedoraimaca.x509 + +%if 0%{?fedora}%{?eln} +%define ima_ca_cert %{SOURCE106} +%endif + +%if 0%{?rhel} && !0%{?eln} +%define ima_ca_cert %{SOURCE103} +# rhel && !eln +%endif %if 0%{?centos} %define ima_signing_cert %{SOURCE105} @@ -1905,26 +1915,32 @@ do done %endif +%if %{signkernel}%{signmodules} + # Add DUP and kpatch certificates to system trusted keys for RHEL %if 0%{?rhel} %{log_msg "Add DUP and kpatch certificates to system trusted keys for RHEL"} -%if %{signkernel}%{signmodules} openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem openssl x509 -inform der -in %{SOURCE102} -out nvidiagpuoot001.pem -openssl x509 -inform der -in %{SOURCE103} -out rhelimaca1.pem -cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem rhelimaca1.pem > ../certs/rhel.pem +cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem > ../certs/rhel.pem %if %{signkernel} %ifarch s390x ppc64le openssl x509 -inform der -in %{secureboot_ca_0} -out secureboot.pem cat secureboot.pem >> ../certs/rhel.pem %endif %endif + +# rhel +%endif + +openssl x509 -inform der -in %{ima_ca_cert} -out imaca.pem +cat imaca.pem >> ../certs/rhel.pem + for i in *.config; do sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS=""@CONFIG_SYSTEM_TRUSTED_KEYS="certs/rhel.pem"@' $i done %endif -%endif # Adjust FIPS module name for RHEL %if 0%{?rhel} @@ -2593,6 +2609,7 @@ BuildKernel() { %else UKI_secureboot_name=redhatsecureboot504 %endif + UKI_secureboot_cert=%{_datadir}/pki/sb-certs/secureboot-uki-virt-%{_arch}.cer %pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.signed -a %{secureboot_ca_0} -c $UKI_secureboot_cert -n $UKI_secureboot_name # 0%{?fedora}%{?eln} @@ -2695,7 +2712,7 @@ BuildKernel() { create_module_file_list "kernel" ../modules-core.list ../kernel${Variant:+-${Variant}}-modules-core.list 1 create_module_file_list "kernel" ../modules.list ../kernel${Variant:+-${Variant}}-modules.list 0 create_module_file_list "internal" ../modules-internal.list ../kernel${Variant:+-${Variant}}-modules-internal.list 0 - create_module_file_list "extra" ../modules-extra.list ../kernel${Variant:+-${Variant}}-modules-extra.list 0 + create_module_file_list "kernel" ../modules-extra.list ../kernel${Variant:+-${Variant}}-modules-extra.list 0 if [[ "$Variant" == "rt" || "$Variant" == "rt-debug" ]]; then create_module_file_list "kvm" ../modules-rt-kvm.list ../kernel${Variant:+-${Variant}}-modules-rt-kvm.list 0 fi @@ -4001,8 +4018,57 @@ fi\ # # %changelog -* Thu May 30 2024 Justin M. Forbes [6.10.0-0.rc1.20240530git4a4be1ad3a6e.20] -- blk-throttle: Fix incorrect display of io.max (Waiman Long) +* Wed Jun 12 2024 Fedora Kernel Team [6.10.0-0.rc3.2ef5971ff345.33] +- gitlab-ci: merge ark-latest before tagging cki-gating (Michael Hofmann) +- Linux v6.10.0-0.rc3.2ef5971ff345 + +* 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 + +* Sun Jun 09 2024 Fedora Kernel Team [6.10.0-0.rc2.771ed66105de.30] +- redhat/configs: fedora: Enable some drivers for IPU6 support (Hans de Goede) +- Linux v6.10.0-0.rc2.771ed66105de + +* Sat Jun 08 2024 Fedora Kernel Team [6.10.0-0.rc2.dc772f8237f9.29] +- Linux v6.10.0-0.rc2.dc772f8237f9 + +* Fri Jun 07 2024 Fedora Kernel Team [6.10.0-0.rc2.8a92980606e3.28] +- Linux v6.10.0-0.rc2.8a92980606e3 + +* Thu Jun 06 2024 Fedora Kernel Team [6.10.0-0.rc2.2df0193e62cf.27] +- redhat: add missing UKI_secureboot_cert hunk (Patrick Talbert) +- Linux v6.10.0-0.rc2.2df0193e62cf + +* Wed Jun 05 2024 Fedora Kernel Team [6.10.0-0.rc2.32f88d65f01b.26] +- redhat/kernel.spec: keep extra modules in original directories (Jan Stancek) +- Linux v6.10.0-0.rc2.32f88d65f01b + +* Tue Jun 04 2024 Fedora Kernel Team [6.10.0-0.rc2.2ab795141095.25] +- redhat/configs: Move CONFIG_BLK_CGROUP_IOCOST=y to common/generic (Waiman Long) +- Turn on CONFIG_MFD_QCOM_PM8008 for Fedora aarch64 (Justin M. Forbes) +- Linux v6.10.0-0.rc2.2ab795141095 + +* Mon Jun 03 2024 Fedora Kernel Team [6.10.0-0.rc2.24] +- Linux v6.10.0-0.rc2 + +* Sun Jun 02 2024 Fedora Kernel Team [6.10.0-0.rc1.83814698cf48.23] +- Linux v6.10.0-0.rc1.83814698cf48 + +* Sat Jun 01 2024 Fedora Kernel Team [6.10.0-0.rc1.cc8ed4d0a848.22] +- Linux v6.10.0-0.rc1.cc8ed4d0a848 + +* Fri May 31 2024 Fedora Kernel Team [6.10.0-0.rc1.4a4be1ad3a6e.21] +- redhat: Build IMA CA certificate into the Fedora kernel (Coiby Xu) +- Move CONFIG_RAS_FMPM to the proper location (Aristeu Rozanski) +- redhat/configs: Remove CONFIG_NET_ACT_IPT (Ivan Vecera) * Thu May 30 2024 Fedora Kernel Team [6.10.0-0.rc1.4a4be1ad3a6e.20] - Linux v6.10.0-0.rc1.4a4be1ad3a6e diff --git a/patch-6.10-redhat.patch b/patch-6.10-redhat.patch index 03ea982e7..e0ea74321 100644 --- a/patch-6.10-redhat.patch +++ b/patch-6.10-redhat.patch @@ -9,8 +9,6 @@ arch/s390/kernel/setup.c | 4 + arch/x86/kernel/cpu/common.c | 1 + arch/x86/kernel/setup.c | 98 +++- - block/blk-throttle.c | 24 +- - block/blk-throttle.h | 8 +- crypto/drbg.c | 18 +- crypto/rng.c | 149 +++++- drivers/acpi/apei/hest.c | 8 + @@ -75,13 +73,13 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 77 files changed, 2532 insertions(+), 225 deletions(-) + 75 files changed, 2518 insertions(+), 207 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 500cfa776225..8de03fac88fc 100644 +index b600df82669d..a22621a159d4 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6954,6 +6954,15 @@ +@@ -6976,6 +6976,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -140,7 +138,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index f975b6396328..c4506bcedfa1 100644 +index 925a75b8ba7d..2d4c5b9dde83 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -254,12 +252,12 @@ index 90c2c786bb35..ce2456f531f1 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 2b170da84f97..deb6685fdd94 100644 +index d4e539d4e158..ed3a7b089b87 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c -@@ -1586,6 +1586,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) - cpu_detect(c); +@@ -1591,6 +1591,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) get_cpu_vendor(c); + intel_unlock_cpuid_leafs(c); get_cpu_cap(c); + get_model_name(c); /* RHEL: get model name for unsupported check */ setup_force_cpu_cap(X86_FEATURE_CPUID); @@ -409,77 +407,6 @@ index 05c5aa951da7..09c1ad947f46 100644 unwind_init(); } -diff --git a/block/blk-throttle.c b/block/blk-throttle.c -index 0be180f9a789..c1bf73f8c75d 100644 ---- a/block/blk-throttle.c -+++ b/block/blk-throttle.c -@@ -1399,32 +1399,32 @@ static u64 tg_prfill_limit(struct seq_file *sf, struct blkg_policy_data *pd, - bps_dft = U64_MAX; - iops_dft = UINT_MAX; - -- if (tg->bps_conf[READ] == bps_dft && -- tg->bps_conf[WRITE] == bps_dft && -- tg->iops_conf[READ] == iops_dft && -- tg->iops_conf[WRITE] == iops_dft) -+ if (tg->bps[READ] == bps_dft && -+ tg->bps[WRITE] == bps_dft && -+ tg->iops[READ] == iops_dft && -+ tg->iops[WRITE] == iops_dft) - return 0; - - seq_printf(sf, "%s", dname); -- if (tg->bps_conf[READ] == U64_MAX) -+ if (tg->bps[READ] == U64_MAX) - seq_printf(sf, " rbps=max"); - else -- seq_printf(sf, " rbps=%llu", tg->bps_conf[READ]); -+ seq_printf(sf, " rbps=%llu", tg->bps[READ]); - -- if (tg->bps_conf[WRITE] == U64_MAX) -+ if (tg->bps[WRITE] == U64_MAX) - seq_printf(sf, " wbps=max"); - else -- seq_printf(sf, " wbps=%llu", tg->bps_conf[WRITE]); -+ seq_printf(sf, " wbps=%llu", tg->bps[WRITE]); - -- if (tg->iops_conf[READ] == UINT_MAX) -+ if (tg->iops[READ] == UINT_MAX) - seq_printf(sf, " riops=max"); - else -- seq_printf(sf, " riops=%u", tg->iops_conf[READ]); -+ seq_printf(sf, " riops=%u", tg->iops[READ]); - -- if (tg->iops_conf[WRITE] == UINT_MAX) -+ if (tg->iops[WRITE] == UINT_MAX) - seq_printf(sf, " wiops=max"); - else -- seq_printf(sf, " wiops=%u", tg->iops_conf[WRITE]); -+ seq_printf(sf, " wiops=%u", tg->iops[WRITE]); - - seq_printf(sf, "\n"); - return 0; -diff --git a/block/blk-throttle.h b/block/blk-throttle.h -index 393c3d134b96..4d9ef5abdf21 100644 ---- a/block/blk-throttle.h -+++ b/block/blk-throttle.h -@@ -95,15 +95,11 @@ struct throtl_grp { - bool has_rules_bps[2]; - bool has_rules_iops[2]; - -- /* internally used bytes per second rate limits */ -+ /* bytes per second rate limits */ - uint64_t bps[2]; -- /* user configured bps limits */ -- uint64_t bps_conf[2]; - -- /* internally used IOPS limits */ -+ /* IOPS limits */ - unsigned int iops[2]; -- /* user configured IOPS limits */ -- unsigned int iops_conf[2]; - - /* Number of bytes dispatched in current slice */ - uint64_t bytes_disp[2]; diff --git a/crypto/drbg.c b/crypto/drbg.c index 3addce90930c..730b03de596a 100644 --- a/crypto/drbg.c @@ -1787,7 +1714,7 @@ index a00671b58701..eeef2766b8b3 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 954f850f113a..35162a8dc97a 100644 +index f5d150c62955..e79f29406916 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -261,6 +261,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1831,7 +1758,7 @@ index 954f850f113a..35162a8dc97a 100644 } else { if (blk_queue_dying(req->q)) return COMPLETE; -@@ -431,6 +436,14 @@ static inline void nvme_end_req(struct request *req) +@@ -436,6 +441,14 @@ void nvme_end_req(struct request *req) blk_mq_end_request(req, status); } @@ -1846,7 +1773,7 @@ index 954f850f113a..35162a8dc97a 100644 void nvme_complete_rq(struct request *req) { struct nvme_ctrl *ctrl = nvme_req(req)->ctrl; -@@ -460,6 +473,9 @@ void nvme_complete_rq(struct request *req) +@@ -465,6 +478,9 @@ void nvme_complete_rq(struct request *req) case FAILOVER: nvme_failover_req(req); return; @@ -1857,7 +1784,7 @@ index 954f850f113a..35162a8dc97a 100644 #ifdef CONFIG_NVME_HOST_AUTH queue_work(nvme_wq, &ctrl->dhchap_auth_work); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index d16e976ae1a4..4dd28efacef0 100644 +index d8b6b4648eaf..7965be5f6ff3 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys) @@ -1893,7 +1820,7 @@ index d16e976ae1a4..4dd28efacef0 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -915,8 +921,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -919,8 +925,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) int error = 0; /* check if multipath is enabled and we have the capability */ @@ -1904,7 +1831,7 @@ index d16e976ae1a4..4dd28efacef0 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index cacc56f4bbf4..486a80ddfc49 100644 +index f3a41133ac3f..9298d5f34925 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -946,6 +946,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); @@ -2160,7 +2087,7 @@ index 88acefbf9aea..bf57fd3b9263 100644 /* Fusion */ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)}, diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -index 89ef43a5ef86..7d8dd062e718 100644 +index 12d08d8ba538..6717350768e4 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -12598,6 +12598,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) @@ -2243,7 +2170,7 @@ index 17cccd14765f..7f0cef737224 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 332eb9dac22d..85b23c0a836d 100644 +index f6c822c9cbd2..db17a2d5173b 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -119,6 +119,14 @@ static const char *sd_cache_types[] = { @@ -2261,7 +2188,7 @@ index 332eb9dac22d..85b23c0a836d 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; -@@ -4240,6 +4248,11 @@ static int __init init_sd(void) +@@ -4242,6 +4250,11 @@ static int __init init_sd(void) goto err_out_class; } @@ -2523,10 +2450,10 @@ index 6717b15e798c..8e1d3eae1686 100644 struct taint_flag { diff --git a/include/linux/pci.h b/include/linux/pci.h -index fb004fd4e889..985984c6fd65 100644 +index cafc5ab1cbcb..632f4e84de19 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1620,6 +1620,7 @@ int pci_add_dynid(struct pci_driver *drv, +@@ -1618,6 +1618,7 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); @@ -2534,7 +2461,7 @@ index fb004fd4e889..985984c6fd65 100644 int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass); -@@ -2666,6 +2667,10 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) +@@ -2664,6 +2665,10 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) return false; } @@ -3222,7 +3149,7 @@ index 3c13240dfc9f..61b2ac156a3e 100644 obj-$(CONFIG_MULTIUSER) += groups.o obj-$(CONFIG_VHOST_TASK) += vhost_task.o diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 2222c3ff88e7..ad54d43bd078 100644 +index f45ed6adc092..3ff4cb164ddd 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -26,6 +26,7 @@ @@ -3257,7 +3184,7 @@ index 2222c3ff88e7..ad54d43bd078 100644 int sysctl_unprivileged_bpf_disabled __read_mostly = IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0; -@@ -6010,6 +6028,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, +@@ -6011,6 +6029,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, if (write && !ret) { if (locked_state && unpriv_enable != 1) return -EPERM; @@ -4236,7 +4163,7 @@ index 000000000000..5c44026c6c81 + +#endif /* __RH_MESSAGES_H */ diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 937294ff164f..eaccbb8639d3 100644 +index f48d72d22dc2..288e0dbe6463 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -22,6 +22,7 @@ @@ -4247,7 +4174,7 @@ index 937294ff164f..eaccbb8639d3 100644 static bool module_enabled; /* Are we using CONFIG_MODVERSIONS? */ -@@ -1992,6 +1993,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -1993,6 +1994,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -4260,7 +4187,7 @@ index 937294ff164f..eaccbb8639d3 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2052,6 +2059,7 @@ static void write_mod_c_file(struct module *mod) +@@ -2053,6 +2060,7 @@ static void write_mod_c_file(struct module *mod) add_depends(&buf, mod); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); diff --git a/sources b/sources index 9672bc3cf..a488113ee 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-rc1-27-g4a4be1ad3a6e.tar.xz) = d9209b2a1096759c6729f9f2c5e59fc70cdf69b38d52971605db0a8d050f6845191fe3e4b0d3b0e92f80fea3fd66c2f33c96a8e06b365b8b98e9fa487997cfb4 -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 89213b1c9fd9927314e7f32e0ae105c654e23aca5f5340202d992424118988db9e253c26bcf2d16b3a679d62544c256bc8ca2d3097e22664ffd60613994542f7 -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 6bf116117094f897f603fbeddee735a034ec2d10a0553d8a076f86f9f97a18527838637e55767696c0d95408033df7be1765f93174debba9c75a73d307c357bd +SHA512 (linux-6.10-rc3-21-g2ef5971ff345.tar.xz) = 7d9b15b3839905a10c7fb08b7fffa4e14780c355526be770262d0a9b13a04423c13c497cb9e6d4394d340cf99a69e09686853639ef7a9d9eee8f87215ab632be +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 377efcdb557b59576d3603640a0c1f541537f68ada98cff45d0bdc24d2156b1f473b6f4140829c860a426caa1dd798934d766f4391602955abe7a5b5a7f8c6b6 +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 66feacd3ff8520dcfdac330d02a881ef161a3a21d7b5dfd218d0d35d0f75f6c289dd0cc79638192db536184cab121c734d22667987a2669f9091fd70612fc710