From f1879fd534d196a61d446b0d3f70bd3e804390df Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 12 Nov 2020 12:18:41 -0600 Subject: [PATCH] kernel-5.10.0-0.rc3.20201112git3d5e28bff7ad.71.test * Thu Nov 12 2020 Fedora Kernel Team [5.10.0-0.rc3.20201112git3d5e28bff7ad.71.test] - 3d5e28bff7ad rebase Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 5 +++-- kernel-aarch64-debug-rhel.config | 1 - kernel-aarch64-fedora.config | 5 +++-- kernel-aarch64-rhel.config | 1 - kernel-armv7hl-debug-fedora.config | 5 +++-- kernel-armv7hl-fedora.config | 5 +++-- kernel-armv7hl-lpae-debug-fedora.config | 5 +++-- kernel-armv7hl-lpae-fedora.config | 5 +++-- kernel-i686-debug-fedora.config | 7 +++---- kernel-i686-fedora.config | 7 +++---- kernel-ppc64le-debug-fedora.config | 5 +++-- kernel-ppc64le-debug-rhel.config | 1 - kernel-ppc64le-fedora.config | 5 +++-- kernel-ppc64le-rhel.config | 1 - kernel-s390x-debug-fedora.config | 5 +++-- kernel-s390x-debug-rhel.config | 1 - kernel-s390x-fedora.config | 5 +++-- kernel-s390x-rhel.config | 1 - kernel-s390x-zfcpdump-rhel.config | 1 - kernel-x86_64-debug-fedora.config | 6 +++--- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-fedora.config | 6 +++--- kernel-x86_64-rhel.config | 2 +- kernel.spec | 24 ++++++++++++++++-------- parallel_xz.sh | 5 +++++ sources | 6 +++--- 27 files changed, 69 insertions(+), 55 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 5deea04ce..f03d2cc98 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 = 68 +RHEL_RELEASE = 73 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 5ceaf91b2..3769ff909 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5430,8 +5430,8 @@ CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_USB_VBUS=m CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m CONFIG_REGULATOR_RK808=y -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m # CONFIG_REGULATOR_SLG51000 is not set CONFIG_REGULATOR_SY8106A=m # CONFIG_REGULATOR_SY8824X is not set @@ -6480,6 +6480,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_SND_SOC_INTEL_KEEMBAY=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 8600dca3c..c36b46370 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2285,7 +2285,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set -# CONFIG_INTEL_IOMMU_SVM is not set # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 3b76920b0..51d201a07 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5411,8 +5411,8 @@ CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_USB_VBUS=m CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m CONFIG_REGULATOR_RK808=y -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m # CONFIG_REGULATOR_SLG51000 is not set CONFIG_REGULATOR_SY8106A=m # CONFIG_REGULATOR_SY8824X is not set @@ -6460,6 +6460,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_SND_SOC_INTEL_KEEMBAY=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 6f5e4efa0..c9ac761c9 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2269,7 +2269,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set -# CONFIG_INTEL_IOMMU_SVM is not set # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index bd288db25..55247c901 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -5534,8 +5534,8 @@ CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_USB_VBUS=m CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m CONFIG_REGULATOR_RK808=y -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m CONFIG_REGULATOR_S2MPA01=m CONFIG_REGULATOR_S2MPS11=m CONFIG_REGULATOR_S5M8767=m @@ -6644,6 +6644,7 @@ CONFIG_SND_SOC_IMX_SSI=m CONFIG_SND_SOC_INTEL_KEEMBAY=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set CONFIG_SND_SOC_LPASS_CPU=m CONFIG_SND_SOC_LPASS_PLATFORM=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 7a480ec3c..1b151d888 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -5516,8 +5516,8 @@ CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_USB_VBUS=m CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m CONFIG_REGULATOR_RK808=y -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m CONFIG_REGULATOR_S2MPA01=m CONFIG_REGULATOR_S2MPS11=m CONFIG_REGULATOR_S5M8767=m @@ -6625,6 +6625,7 @@ CONFIG_SND_SOC_IMX_SSI=m CONFIG_SND_SOC_INTEL_KEEMBAY=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set CONFIG_SND_SOC_LPASS_CPU=m CONFIG_SND_SOC_LPASS_PLATFORM=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index aa0f311c5..ca5c6fd8e 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -5364,8 +5364,8 @@ CONFIG_REGULATOR_PV88090=m CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m CONFIG_REGULATOR_RK808=y -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m CONFIG_REGULATOR_S2MPA01=m CONFIG_REGULATOR_S2MPS11=m CONFIG_REGULATOR_S5M8767=m @@ -6438,6 +6438,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_SND_SOC_INTEL_KEEMBAY=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index bb9e156f0..2009b5484 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5346,8 +5346,8 @@ CONFIG_REGULATOR_PV88090=m CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m CONFIG_REGULATOR_RK808=y -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m CONFIG_REGULATOR_S2MPA01=m CONFIG_REGULATOR_S2MPS11=m CONFIG_REGULATOR_S5M8767=m @@ -6419,6 +6419,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_SND_SOC_INTEL_KEEMBAY=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 169a56f15..14359e34a 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -2565,7 +2565,6 @@ CONFIG_INTEL_IOATDMA=m # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y -CONFIG_INTEL_IOMMU_SVM=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IPS=m CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m @@ -4889,8 +4888,8 @@ CONFIG_REGULATOR_MP886X=m # CONFIG_REGULATOR_PV88090 is not set # CONFIG_REGULATOR_PWM is not set # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set @@ -5877,7 +5876,7 @@ CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m -CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set CONFIG_SND_SOC_INTEL_SST_ACPI=m CONFIG_SND_SOC_INTEL_SST=m CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index bbda751b0..bd509a1cb 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -2548,7 +2548,6 @@ CONFIG_INTEL_IOATDMA=m # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y -CONFIG_INTEL_IOMMU_SVM=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IPS=m CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m @@ -4870,8 +4869,8 @@ CONFIG_REGULATOR_MP886X=m # CONFIG_REGULATOR_PV88090 is not set # CONFIG_REGULATOR_PWM is not set # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set @@ -5857,7 +5856,7 @@ CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m -CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set CONFIG_SND_SOC_INTEL_SST_ACPI=m CONFIG_SND_SOC_INTEL_SST=m CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 265bd84be..da5d57418 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4561,8 +4561,8 @@ CONFIG_REGULATOR_MP886X=m # CONFIG_REGULATOR_PV88090 is not set # CONFIG_REGULATOR_PWM is not set # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set @@ -5493,6 +5493,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_INTEL_KEEMBAY=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set # CONFIG_SND_SOC is not set CONFIG_SND_SOC_MAX9759=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 85201d9b3..773b44912 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2154,7 +2154,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set -# CONFIG_INTEL_IOMMU_SVM is not set # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 02c6fe328..156b39962 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4541,8 +4541,8 @@ CONFIG_REGULATOR_MP886X=m # CONFIG_REGULATOR_PV88090 is not set # CONFIG_REGULATOR_PWM is not set # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set @@ -5472,6 +5472,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_INTEL_KEEMBAY=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set # CONFIG_SND_SOC is not set CONFIG_SND_SOC_MAX9759=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 842cb2022..183b824e2 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2138,7 +2138,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set -# CONFIG_INTEL_IOMMU_SVM is not set # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 2fae273fb..18e6929b2 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4496,8 +4496,8 @@ CONFIG_REGULATOR_MP886X=m # CONFIG_REGULATOR_PV88090 is not set # CONFIG_REGULATOR_PWM is not set # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set @@ -5437,6 +5437,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_INTEL_KEEMBAY=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 60d232056..9e3b7fcbe 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2128,7 +2128,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set -# CONFIG_INTEL_IOMMU_SVM is not set # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 18e0dca0a..614a7ed62 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4476,8 +4476,8 @@ CONFIG_REGULATOR_MP886X=m # CONFIG_REGULATOR_PV88090 is not set # CONFIG_REGULATOR_PWM is not set # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set @@ -5416,6 +5416,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_INTEL_KEEMBAY=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 57f6cd40e..b76a16334 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2112,7 +2112,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set -# CONFIG_INTEL_IOMMU_SVM is not set # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 14d9503df..a264a89b7 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2131,7 +2131,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set -# CONFIG_INTEL_IOMMU_SVM is not set # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 470cd5a5a..cb1cad95d 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4930,8 +4930,8 @@ CONFIG_REGULATOR_MP886X=m # CONFIG_REGULATOR_PV88090 is not set # CONFIG_REGULATOR_PWM is not set # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set @@ -5927,7 +5927,7 @@ CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m -CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set CONFIG_SND_SOC_INTEL_SST_ACPI=m CONFIG_SND_SOC_INTEL_SST=m CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index a3d2c4b8e..1e3a5c93a 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2297,7 +2297,7 @@ CONFIG_INTEL_IOATDMA=m # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set -# CONFIG_INTEL_IOMMU_SVM is not set +CONFIG_INTEL_IOMMU_SVM=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IPS=m # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 726192907..91405eac4 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4911,8 +4911,8 @@ CONFIG_REGULATOR_MP886X=m # CONFIG_REGULATOR_PV88090 is not set # CONFIG_REGULATOR_PWM is not set # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set -# CONFIG_REGULATOR_RT4801 is not set -# CONFIG_REGULATOR_RTMV20 is not set +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set @@ -5907,7 +5907,7 @@ CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m -CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m +# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set CONFIG_SND_SOC_INTEL_SST_ACPI=m CONFIG_SND_SOC_INTEL_SST=m CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 8baf4ea63..b78eb20fa 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2281,7 +2281,7 @@ CONFIG_INTEL_IOATDMA=m # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set -# CONFIG_INTEL_IOMMU_SVM is not set +CONFIG_INTEL_IOMMU_SVM=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IPS=m # CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set diff --git a/kernel.spec b/kernel.spec index 1f186f099..5ee447f7a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc3.68 +%global distro_build 0.rc3.20201112git3d5e28bff7ad.73 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -95,13 +95,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.10.0 -%define pkgrelease 0.rc3.68 +%define pkgrelease 0.rc3.20201112git3d5e28bff7ad.73 # This is needed to do merge window version magic %define patchlevel 10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.68%{?buildid}%{?dist} +%define specrelease 0.rc3.20201112git3d5e28bff7ad.73%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -191,7 +191,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # The kernel tarball/base version %define kversion 5.10 @@ -592,7 +592,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.10-rc3.tar.xz +Source0: linux-20201112git3d5e28bff7ad.tar.xz Source1: Makefile.rhelver @@ -1236,8 +1236,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.10-rc3 -c -mv linux-5.10-rc3 linux-%{KVERREL} +%setup -q -n kernel-20201112git3d5e28bff7ad -c +mv linux-20201112git3d5e28bff7ad linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2689,7 +2689,15 @@ fi # # %changelog -* Mon Nov 09 2020 Justin M. Forbes [5.10.0-0.rc3.68] +* Thu Nov 12 2020 Fedora Kernel Team [5.10.0-0.rc3.20201112git3d5e28bff7ad.71.test] +- 3d5e28bff7ad rebase + +* Wed Nov 11 2020 Fedora Kernel Team [5.10.0-0.rc3.20201111giteccc87672492.68.test] +- eccc87672492 rebase +- redhat: enable CONFIG_INTEL_IOMMU_SVM (Jerry Snitselaar) + +* Tue Nov 10 2020 Fedora Kernel Team [5.10.0-0.rc3.67.test] +- More Fedora config fixes ("Justin M. Forbes") - Fedora 5.10 config updates ("Justin M. Forbes") * Mon Nov 09 2020 Fedora Kernel Team [5.10.0-0.rc3.66.test] diff --git a/parallel_xz.sh b/parallel_xz.sh index bc08a548d..07013f149 100755 --- a/parallel_xz.sh +++ b/parallel_xz.sh @@ -16,6 +16,11 @@ while test "$#" != 0; do shift done +#This seems to cause problems with large numbers +if (( $procgroup > 12 )); then + procgroup=12 +fi + # If told to use only one cpu: test "$procgroup" || exec xargs -r xz test "$procgroup" = 1 && exec xargs -r xz diff --git a/sources b/sources index 00142679c..8a08fd4b6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.10-rc3.tar.xz) = ffb28a16424d68e9fb66e3a6361b78e0b5e49e3a98ea76a99f562d3927f63ed363c3b04791671a37f4e47044d5a68a962e52daf01a4c07496dbf713e8a22c862 -SHA512 (kernel-abi-whitelists-5.10.0-0.rc3.68.tar.bz2) = 1fa2fa9d32b693d71f2e6006c00114c289d1d1ff16ca80f0beea9eeed4788b99490e60da75bec252ccacb92c375683412e2846f250a37bcb9cab107cfd70b73d -SHA512 (kernel-kabi-dw-5.10.0-0.rc3.68.tar.bz2) = e46d254e2f108d07f2364509b57068b9c3f8e64e3e58105e3f480d183d81b10a3aea711f156617e3cd5aa8cec1b91509d8b5342a3168f3e94131f51060e2e384 +SHA512 (linux-20201112git3d5e28bff7ad.tar.xz) = 36d5c201b21618aca399b0c1d648a85d42de9d9f2abd8d4ea4c7047b981c1257160b2cfbc40495d6f532ce6698eac04bb81eae0c03a1b5e4a8c6dda205cf3a0e +SHA512 (kernel-abi-whitelists-5.10.0-0.rc3.20201112git3d5e28bff7ad.73.tar.bz2) = 70a68d159004f7ec5cfbfd8c0cb4b1eaf25b4177e2c3921158ff0da45df549befe27d2de35d5adbd2e96c5c043e70e16c81dfc1e6224df396b7fea4528eb1089 +SHA512 (kernel-kabi-dw-5.10.0-0.rc3.20201112git3d5e28bff7ad.73.tar.bz2) = b6c2240cfa0c093ea9c63f5ed1bfb5e05fd1fc708e6ebf28e4e6f332260eff95187daca1f99882ace65bfeef82c7a4afd4fdc16e1cf2220d9454cd52c598eb37