From 3345ef10f33e46c7310e1a7ef4cf5b1e02fa6064 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 22 Nov 2023 11:18:33 -0600 Subject: [PATCH] kernel-6.7.0-0.rc2.20231122gitc2d5304e6c64.23 * Wed Nov 22 2023 Fedora Kernel Team [6.7.0-0.rc2.c2d5304e6c64.23] - redhat/configs: Move IOMMUFD to common (Alex Williamson) - redhat: Really remove cpupower files (Prarit Bhargava) - redhat: remove update_scripts.sh (Prarit Bhargava) - Linux v6.7.0-0.rc2.c2d5304e6c64 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-64k-debug-rhel.config | 6 ++++- kernel-aarch64-64k-rhel.config | 6 ++++- kernel-aarch64-debug-rhel.config | 6 ++++- kernel-aarch64-rhel.config | 6 ++++- kernel-aarch64-rt-debug-rhel.config | 6 ++++- kernel-aarch64-rt-rhel.config | 6 ++++- kernel-ppc64le-debug-rhel.config | 8 ++++--- kernel-ppc64le-rhel.config | 8 ++++--- kernel-s390x-debug-rhel.config | 8 ++++--- kernel-s390x-rhel.config | 8 ++++--- kernel-s390x-zfcpdump-rhel.config | 8 ++++--- kernel-x86_64-debug-fedora.config | 6 +++-- kernel-x86_64-debug-rhel.config | 8 ++++--- kernel-x86_64-fedora.config | 6 +++-- kernel-x86_64-rhel.config | 8 ++++--- kernel-x86_64-rt-debug-rhel.config | 8 ++++--- kernel-x86_64-rt-rhel.config | 8 ++++--- kernel.spec | 36 +++++++++++++++++++--------- sources | 6 ++--- update_scripts.sh | 12 ---------- 21 files changed, 112 insertions(+), 64 deletions(-) delete mode 100755 update_scripts.sh diff --git a/Makefile.rhelver b/Makefile.rhelver index 9e42da42f..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 = 22 +RHEL_RELEASE = 23 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 9771e3505..df172c26e 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -2844,7 +2844,8 @@ CONFIG_IOMMU_DEBUGFS=y CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -7547,7 +7548,10 @@ CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y CONFIG_VFIO_FSL_MC=m +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m # CONFIG_VFIO_MDEV is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 5f6246825..5b5f611ab 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -2828,7 +2828,8 @@ CONFIG_IO_DELAY_0X80=y CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -7522,7 +7523,10 @@ CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y CONFIG_VFIO_FSL_MC=m +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m # CONFIG_VFIO_MDEV is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index fccffe481..3c314927e 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2840,7 +2840,8 @@ CONFIG_IOMMU_DEBUGFS=y CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -7543,7 +7544,10 @@ CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y CONFIG_VFIO_FSL_MC=m +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m # CONFIG_VFIO_MDEV is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index f3bde7473..3c7b5bdc8 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2824,7 +2824,8 @@ CONFIG_IO_DELAY_0X80=y CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -7518,7 +7519,10 @@ CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y CONFIG_VFIO_FSL_MC=m +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m # CONFIG_VFIO_MDEV is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 92cb4dfc3..61a256b0c 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -2880,7 +2880,8 @@ CONFIG_IOMMU_DEBUGFS=y CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -7598,7 +7599,10 @@ CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y CONFIG_VFIO_FSL_MC=m +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m # CONFIG_VFIO_MDEV is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 43af8bdf6..1e87c7d9d 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -2864,7 +2864,8 @@ CONFIG_IO_DELAY_0X80=y CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -7573,7 +7574,10 @@ CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y CONFIG_VFIO_FSL_MC=m +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m # CONFIG_VFIO_MDEV is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index c57f6876a..0060f8742 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -265,7 +265,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_SCMI_PERF_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set @@ -2528,7 +2527,8 @@ CONFIG_IOMMU_DEBUGFS=y # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -4616,7 +4616,6 @@ CONFIG_PWM=y # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set # CONFIG_QCOM_QFPROM is not set -# CONFIG_QCOM_QSEECOM is not set # CONFIG_QCOM_RAMP_CTRL is not set # CONFIG_QCOM_RMTFS_MEM is not set # CONFIG_QCOM_RPM_MASTER_STATS is not set @@ -7024,6 +7023,9 @@ CONFIG_VETH=m # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m # CONFIG_VFIO_MDEV is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 7ebdb1852..c740d75ad 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -265,7 +265,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_SCMI_PERF_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set @@ -2512,7 +2511,8 @@ CONFIG_IO_EVENT_IRQ=y # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -4595,7 +4595,6 @@ CONFIG_PWM=y # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set # CONFIG_QCOM_QFPROM is not set -# CONFIG_QCOM_QSEECOM is not set # CONFIG_QCOM_RAMP_CTRL is not set # CONFIG_QCOM_RMTFS_MEM is not set # CONFIG_QCOM_RPM_MASTER_STATS is not set @@ -7001,6 +7000,9 @@ CONFIG_VETH=m # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m # CONFIG_VFIO_MDEV is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 43b23880f..2fb4f8ace 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -264,7 +264,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_SCMI_PERF_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set @@ -2514,7 +2513,8 @@ CONFIG_IOMMU_DEBUGFS=y # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -4553,7 +4553,6 @@ CONFIG_PTP_1588_CLOCK=y # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set # CONFIG_QCOM_QFPROM is not set -# CONFIG_QCOM_QSEECOM is not set # CONFIG_QCOM_RAMP_CTRL is not set # CONFIG_QCOM_RMTFS_MEM is not set # CONFIG_QCOM_RPM_MASTER_STATS is not set @@ -7007,6 +7006,9 @@ CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set CONFIG_VFIO_AP=m CONFIG_VFIO_CCW=m +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m CONFIG_VFIO_MDEV=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 2647f173a..9feeffa72 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -264,7 +264,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_SCMI_PERF_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set @@ -2498,7 +2497,8 @@ CONFIG_IO_DELAY_0X80=y # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -4532,7 +4532,6 @@ CONFIG_PTP_1588_CLOCK=y # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set # CONFIG_QCOM_QFPROM is not set -# CONFIG_QCOM_QSEECOM is not set # CONFIG_QCOM_RAMP_CTRL is not set # CONFIG_QCOM_RMTFS_MEM is not set # CONFIG_QCOM_RPM_MASTER_STATS is not set @@ -6984,6 +6983,9 @@ CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set CONFIG_VFIO_AP=m CONFIG_VFIO_CCW=m +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m CONFIG_VFIO_MDEV=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 6daf0b1cd..b857169af 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -264,7 +264,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_SCMI_PERF_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set @@ -2506,7 +2505,8 @@ CONFIG_IO_DELAY_0X80=y # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -4545,7 +4545,6 @@ CONFIG_PTP_1588_CLOCK=y # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set # CONFIG_QCOM_QFPROM is not set -# CONFIG_QCOM_QSEECOM is not set # CONFIG_QCOM_RAMP_CTRL is not set # CONFIG_QCOM_RMTFS_MEM is not set # CONFIG_QCOM_RPM_MASTER_STATS is not set @@ -7007,6 +7006,9 @@ CONFIG_VETH=m # CONFIG_VFIO_AMBA is not set CONFIG_VFIO_AP=m CONFIG_VFIO_CCW=m +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m # CONFIG_VFIO is not set CONFIG_VFIO_MDEV=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 51d2faac8..a112de951 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -7922,9 +7922,11 @@ CONFIG_USB_DSBR=m # CONFIG_USB_DWC2_PERIPHERAL is not set # CONFIG_USB_DWC3_GADGET is not set # CONFIG_USB_DWC3_HAPS is not set -# CONFIG_USB_DWC3_HOST is not set -# CONFIG_USB_DWC3 is not set +CONFIG_USB_DWC3_HOST=y +CONFIG_USB_DWC3=m # CONFIG_USB_DWC3_OF_SIMPLE is not set +CONFIG_USB_DWC3_PCI=m +# CONFIG_USB_DWC3_ULPI is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_EHCI_FSL is not set # CONFIG_USB_EHCI_HCD_PLATFORM is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 439048226..1168d3bcb 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -290,7 +290,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_SCMI_PERF_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set @@ -2708,7 +2707,8 @@ CONFIG_IOMMU_DEBUGFS=y CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -4804,7 +4804,6 @@ CONFIG_PWM=y # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set # CONFIG_QCOM_QFPROM is not set -# CONFIG_QCOM_QSEECOM is not set # CONFIG_QCOM_RAMP_CTRL is not set # CONFIG_QCOM_RMTFS_MEM is not set # CONFIG_QCOM_RPM_MASTER_STATS is not set @@ -7277,6 +7276,9 @@ CONFIG_VETH=m # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m CONFIG_VFIO_MDEV=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 8c9e3e1a1..a04380ff0 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -7892,9 +7892,11 @@ CONFIG_USB_DSBR=m # CONFIG_USB_DWC2_PERIPHERAL is not set # CONFIG_USB_DWC3_GADGET is not set # CONFIG_USB_DWC3_HAPS is not set -# CONFIG_USB_DWC3_HOST is not set -# CONFIG_USB_DWC3 is not set +CONFIG_USB_DWC3_HOST=y +CONFIG_USB_DWC3=m # CONFIG_USB_DWC3_OF_SIMPLE is not set +CONFIG_USB_DWC3_PCI=m +# CONFIG_USB_DWC3_ULPI is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_EHCI_FSL is not set # CONFIG_USB_EHCI_HCD_PLATFORM is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index ef1f5a635..aff85331f 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -290,7 +290,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_SCMI_PERF_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set @@ -2692,7 +2691,8 @@ CONFIG_IO_DELAY_0X80=y CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -4782,7 +4782,6 @@ CONFIG_PWM=y # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set # CONFIG_QCOM_QFPROM is not set -# CONFIG_QCOM_QSEECOM is not set # CONFIG_QCOM_RAMP_CTRL is not set # CONFIG_QCOM_RMTFS_MEM is not set # CONFIG_QCOM_RPM_MASTER_STATS is not set @@ -7253,6 +7252,9 @@ CONFIG_VETH=m # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m CONFIG_VFIO_MDEV=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index ef8f2a00c..48a5daed2 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -290,7 +290,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_SCMI_PERF_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set @@ -2748,7 +2747,8 @@ CONFIG_IOMMU_DEBUGFS=y CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -4853,7 +4853,6 @@ CONFIG_PWM=y # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set # CONFIG_QCOM_QFPROM is not set -# CONFIG_QCOM_QSEECOM is not set # CONFIG_QCOM_RAMP_CTRL is not set # CONFIG_QCOM_RMTFS_MEM is not set # CONFIG_QCOM_RPM_MASTER_STATS is not set @@ -7332,6 +7331,9 @@ CONFIG_VETH=m # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m CONFIG_VFIO_MDEV=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index bfaef3ba5..f84e6b9ce 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -290,7 +290,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_SCMI_PERF_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set # CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set @@ -2732,7 +2731,8 @@ CONFIG_IO_DELAY_0X80=y CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -# CONFIG_IOMMUFD is not set +CONFIG_IOMMUFD=m +# CONFIG_IOMMUFD_TEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_DART is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -4831,7 +4831,6 @@ CONFIG_PWM=y # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set # CONFIG_QCOM_QFPROM is not set -# CONFIG_QCOM_QSEECOM is not set # CONFIG_QCOM_RAMP_CTRL is not set # CONFIG_QCOM_RMTFS_MEM is not set # CONFIG_QCOM_RPM_MASTER_STATS is not set @@ -7308,6 +7307,9 @@ CONFIG_VETH=m # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m # CONFIG_VFIO_AMBA is not set +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_DEVICE_CDEV=y +CONFIG_VFIO_GROUP=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m CONFIG_VFIO_MDEV=m diff --git a/kernel.spec b/kernel.spec index 847f77658..228eca75b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc2.22 +%define pkgrelease 0.rc2.20231122gitc2d5304e6c64.23 %define kversion 6 -%define tarfile_release 6.7-rc2 +%define tarfile_release 6.7-rc2-14-gc2d5304e6c64 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.22%{?buildid}%{?dist} +%define specrelease 0.rc2.20231122gitc2d5304e6c64.23%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -919,8 +919,6 @@ Source77: partial-clang_lto-aarch64-debug-snip.config Source80: generate_all_configs.sh Source81: process_configs.sh -Source82: update_scripts.sh - Source84: mod-internal.list Source85: mod-partner.list @@ -1859,20 +1857,27 @@ done %endif RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=%{name} ./process_configs.sh $OPTS %{specrpmversion} -cp %{SOURCE82} . -RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} - # We may want to override files from the primary target in case of building # against a flavour of it (eg. centos not rhel), thus override it here if # necessary +update_scripts() { + TARGET="$1" + + for i in "$RPM_SOURCE_DIR"/*."$TARGET"; do + NEW=${i%."$TARGET"} + cp "$i" "$(basename "$NEW")" + done +} + +update_target=%{primary_target} if [ "%{primary_target}" == "rhel" ]; then +: # no-op to avoid empty if-fi error %if 0%{?centos} echo "Updating scripts/sources to centos version" - RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh centos -%else - echo "Not updating scripts/sources to centos version" + update_target=centos %endif fi +update_scripts $update_target # end of kernel config %endif @@ -3709,6 +3714,15 @@ fi\ # # %changelog +* Wed Nov 22 2023 Justin M. Forbes [6.7.0-0.rc2.20231122gitc2d5304e6c64.23] +- Turn on USB_DWC3 for Fedora (rhbz 2250955) (Justin M. Forbes) + +* Wed Nov 22 2023 Fedora Kernel Team [6.7.0-0.rc2.c2d5304e6c64.23] +- redhat/configs: Move IOMMUFD to common (Alex Williamson) +- redhat: Really remove cpupower files (Prarit Bhargava) +- redhat: remove update_scripts.sh (Prarit Bhargava) +- Linux v6.7.0-0.rc2.c2d5304e6c64 + * Mon Nov 20 2023 Fedora Kernel Team [6.7.0-0.rc2.22] - Fix s390 zfcpfdump bpf build failures for cgroups (Don Zickus) - Linux v6.7.0-0.rc2 diff --git a/sources b/sources index c96bb03d5..9e7f88e26 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.7-rc2.tar.xz) = 138db90ac416fdc44e9a6413562df92e73d975ab669da56d8d6c2ddd43f18f399ff79aee1c7af7816d3a9a2d6f9000a65d291b870f7652842b6f2cd0e083607c -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 9e3215de07c1fe043102ebfb649bf8bd69540285aa6af6e9a71a33d4fe8684478e7da3b38f329dce7f4ecd2a9f608b18f7f3a769407275fd4c4e795461991b7f -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = d052674a1c0d7b3d601dc3b739bbc97401ea3432cd281c6cd46f031aa0702283bd718084121518b7bb0ed321bbfeb86757fc25ba2ddf8c6d8e141705ca886f11 +SHA512 (linux-6.7-rc2-14-gc2d5304e6c64.tar.xz) = 7d694844e84573f9ccad028ea7175fec702e8b00e9244f9749a0d92a609c1e64e0a42bdc33162b657c67d6ca7247457dbd1bab43c4a5e8ac9ec9f5856f5e44f0 +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 908d351ed64a373486f2ebfae607244e37c6fe124ceff8ac910ddea06acc943ce1eda59f4b25773c45b251b176229b70ead197e88e34ee383958d29b5ab4dabb +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 8ca309116cffac10c74f0103aa996f2ebd59f5f3eed40b4d95bad245ff363d6a5ce0ec973b6d3f48c21ce50a391314215d4776745e01f44072b0a7e4519d5e12 diff --git a/update_scripts.sh b/update_scripts.sh deleted file mode 100755 index 5dce4fa94..000000000 --- a/update_scripts.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if [ -z "$1" ]; then - exit 1 -fi - -TARGET="$1" - -for i in "$RPM_SOURCE_DIR"/*."$TARGET"; do - NEW=${i%."$TARGET"} - cp "$i" "$(basename "$NEW")" -done