summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-04-07 15:30:19 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-04-07 15:30:19 -0500
commit2db8df88f66eacaa9bec1995431388fb3a044566 (patch)
treef030d86647b929e5d251b8e9880ed559045fa321
parentc918bd768aa916cb376b54354b0753903a1a18b5 (diff)
downloadkernel-2db8df88f66eacaa9bec1995431388fb3a044566.tar.gz
kernel-2db8df88f66eacaa9bec1995431388fb3a044566.tar.xz
kernel-2db8df88f66eacaa9bec1995431388fb3a044566.zip
kernel-5.12.0-0.rc6.20210407git2d743660786e.185
* Wed Apr 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc6.20210407git2d743660786e.185] - common/ark: cleanup and unify the parport configs (Peter Robinson) - iommu/vt-d: enable INTEL_IDXD_SVM for both fedora and rhel (Jerry Snitselaar) - REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70 (Jeremy Linton) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog3
-rw-r--r--kernel-aarch64-debug-fedora.config5
-rw-r--r--kernel-aarch64-debug-rhel.config14
-rw-r--r--kernel-aarch64-fedora.config5
-rw-r--r--kernel-aarch64-rhel.config14
-rw-r--r--kernel-armv7hl-debug-fedora.config5
-rw-r--r--kernel-armv7hl-fedora.config5
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config5
-rw-r--r--kernel-armv7hl-lpae-fedora.config5
-rw-r--r--kernel-i686-debug-fedora.config1
-rw-r--r--kernel-i686-fedora.config1
-rw-r--r--kernel-ppc64le-debug-fedora.config5
-rw-r--r--kernel-ppc64le-debug-rhel.config18
-rw-r--r--kernel-ppc64le-fedora.config5
-rw-r--r--kernel-ppc64le-rhel.config18
-rw-r--r--kernel-s390x-debug-fedora.config5
-rw-r--r--kernel-s390x-debug-rhel.config14
-rw-r--r--kernel-s390x-fedora.config5
-rw-r--r--kernel-s390x-rhel.config14
-rw-r--r--kernel-s390x-zfcpdump-rhel.config14
-rw-r--r--kernel-x86_64-debug-fedora.config1
-rw-r--r--kernel-x86_64-debug-rhel.config4
-rw-r--r--kernel-x86_64-fedora.config1
-rw-r--r--kernel-x86_64-rhel.config4
-rwxr-xr-xkernel.spec19
-rw-r--r--patch-5.12.0-redhat.patch180
-rw-r--r--sources6
28 files changed, 164 insertions, 214 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index b8928bb39..7fa15e3ea 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 = 184
+RHEL_RELEASE = 185
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index d2fc48e81..86d5bd7ba 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/867c17b1e141b774eb34d56a6ebc9c6c5f259b4b
+ 867c17b1e141b774eb34d56a6ebc9c6c5f259b4b REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70
+
https://gitlab.com/cki-project/kernel-ark/-/commit/da4e612568dc657270f6f40d79c948c764d8b689
da4e612568dc657270f6f40d79c948c764d8b689 Revert "mm/kmemleak: skip late_init if not skip disable"
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 8d87e9058..0b98f0b29 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2670,6 +2670,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
@@ -2956,7 +2957,6 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
# CONFIG_INTEL_LDMA is not set
# CONFIG_INTEL_MEI_VIRTIO is not set
@@ -4857,7 +4857,6 @@ CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
@@ -6915,7 +6914,6 @@ CONFIG_SPI_BCM2835AUX=m
CONFIG_SPI_BCM2835=m
# CONFIG_SPI_BCM_QSPI is not set
CONFIG_SPI_BITBANG=m
-# CONFIG_SPI_BUTTERFLY is not set
CONFIG_SPI_CADENCE=m
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
@@ -6934,7 +6932,6 @@ CONFIG_SPI_HISI_SFC=m
# CONFIG_SPI_HISI_SFC_V3XX is not set
CONFIG_SPI_IMX=m
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 995ae3956..467808700 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2096,8 +2096,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_QCOM_CCI is not set
@@ -2330,7 +2329,6 @@ CONFIG_INTEGRITY=y
# CONFIG_INTEL_ATOMISP2_PM is not set
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_INT0002_VGPIO is not set
# CONFIG_INTEL_IOMMU_DEBUGFS is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
@@ -3910,14 +3908,8 @@ CONFIG_PANIC_TIMEOUT=0
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
-# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
CONFIG_PARTITION_ADVANCED=y
# CONFIG_PATA_ACPI is not set
# CONFIG_PATA_ALI is not set
@@ -4186,7 +4178,6 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
CONFIG_PPS=y
CONFIG_PPTP=m
@@ -5481,7 +5472,6 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BCM_QSPI is not set
# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
CONFIG_SPI_DEBUG=y
@@ -5490,7 +5480,6 @@ CONFIG_SPI_DEBUG=y
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_HISI_SFC_V3XX is not set
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
# CONFIG_SPI_MEM is not set
@@ -6116,7 +6105,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
CONFIG_USB_SERIAL_MXUPORT=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index bfc38088c..aa5cfa6ac 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2654,6 +2654,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
@@ -2940,7 +2941,6 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
# CONFIG_INTEL_LDMA is not set
# CONFIG_INTEL_MEI_VIRTIO is not set
@@ -4834,7 +4834,6 @@ CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
@@ -6890,7 +6889,6 @@ CONFIG_SPI_BCM2835AUX=m
CONFIG_SPI_BCM2835=m
# CONFIG_SPI_BCM_QSPI is not set
CONFIG_SPI_BITBANG=m
-# CONFIG_SPI_BUTTERFLY is not set
CONFIG_SPI_CADENCE=m
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
@@ -6909,7 +6907,6 @@ CONFIG_SPI_HISI_SFC=m
# CONFIG_SPI_HISI_SFC_V3XX is not set
CONFIG_SPI_IMX=m
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 3471acc1a..cc94ddf7c 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2080,8 +2080,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_QCOM_CCI is not set
@@ -2314,7 +2313,6 @@ CONFIG_INTEGRITY=y
# CONFIG_INTEL_ATOMISP2_PM is not set
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_INT0002_VGPIO is not set
# CONFIG_INTEL_IOMMU_DEBUGFS is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
@@ -3889,14 +3887,8 @@ CONFIG_PANIC_TIMEOUT=0
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
-# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
CONFIG_PARTITION_ADVANCED=y
# CONFIG_PATA_ACPI is not set
# CONFIG_PATA_ALI is not set
@@ -4165,7 +4157,6 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
CONFIG_PPS=y
CONFIG_PPTP=m
@@ -5458,7 +5449,6 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BCM_QSPI is not set
# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
@@ -5467,7 +5457,6 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_HISI_SFC_V3XX is not set
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
# CONFIG_SPI_MEM is not set
@@ -6092,7 +6081,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
CONFIG_USB_SERIAL_MXUPORT=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index edd42c4af..cf34b4795 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2697,6 +2697,7 @@ CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OMAP=y
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
@@ -2992,7 +2993,6 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
# CONFIG_INTEL_LDMA is not set
# CONFIG_INTEL_MEI_VIRTIO is not set
@@ -4967,7 +4967,6 @@ CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_PATA_ALI is not set
@@ -7122,7 +7121,6 @@ CONFIG_SPI_BCM2835AUX=m
CONFIG_SPI_BCM2835=m
# CONFIG_SPI_BCM_QSPI is not set
CONFIG_SPI_BITBANG=m
-# CONFIG_SPI_BUTTERFLY is not set
CONFIG_SPI_CADENCE=m
# CONFIG_SPI_CADENCE_QUADSPI is not set
CONFIG_SPI_DAVINCI=m
@@ -7140,7 +7138,6 @@ CONFIG_SPI_GPIO=m
# CONFIG_SPI_HISI_SFC_V3XX is not set
CONFIG_SPI_IMX=m
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index fd2f2d6f7..c6f26e271 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2682,6 +2682,7 @@ CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OMAP=y
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
@@ -2977,7 +2978,6 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
# CONFIG_INTEL_LDMA is not set
# CONFIG_INTEL_MEI_VIRTIO is not set
@@ -4945,7 +4945,6 @@ CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_PATA_ALI is not set
@@ -7098,7 +7097,6 @@ CONFIG_SPI_BCM2835AUX=m
CONFIG_SPI_BCM2835=m
# CONFIG_SPI_BCM_QSPI is not set
CONFIG_SPI_BITBANG=m
-# CONFIG_SPI_BUTTERFLY is not set
CONFIG_SPI_CADENCE=m
# CONFIG_SPI_CADENCE_QUADSPI is not set
CONFIG_SPI_DAVINCI=m
@@ -7116,7 +7114,6 @@ CONFIG_SPI_GPIO=m
# CONFIG_SPI_HISI_SFC_V3XX is not set
CONFIG_SPI_IMX=m
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 13df7fe36..cdd4e2107 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2642,6 +2642,7 @@ CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OMAP=y
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
@@ -2925,7 +2926,6 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
# CONFIG_INTEL_LDMA is not set
# CONFIG_INTEL_MEI_VIRTIO is not set
@@ -4853,7 +4853,6 @@ CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_PATA_ALI is not set
@@ -6889,7 +6888,6 @@ CONFIG_SPI_BCM2835AUX=m
CONFIG_SPI_BCM2835=m
# CONFIG_SPI_BCM_QSPI is not set
CONFIG_SPI_BITBANG=m
-# CONFIG_SPI_BUTTERFLY is not set
CONFIG_SPI_CADENCE=m
# CONFIG_SPI_CADENCE_QUADSPI is not set
CONFIG_SPI_DAVINCI=m
@@ -6907,7 +6905,6 @@ CONFIG_SPI_GPIO=m
# CONFIG_SPI_HISI_SFC_V3XX is not set
CONFIG_SPI_IMX=m
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 859eeef20..72fe890b1 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2627,6 +2627,7 @@ CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OMAP=y
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
@@ -2910,7 +2911,6 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
# CONFIG_INTEL_LDMA is not set
# CONFIG_INTEL_MEI_VIRTIO is not set
@@ -4831,7 +4831,6 @@ CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_PATA_ALI is not set
@@ -6865,7 +6864,6 @@ CONFIG_SPI_BCM2835AUX=m
CONFIG_SPI_BCM2835=m
# CONFIG_SPI_BCM_QSPI is not set
CONFIG_SPI_BITBANG=m
-# CONFIG_SPI_BUTTERFLY is not set
CONFIG_SPI_CADENCE=m
# CONFIG_SPI_CADENCE_QUADSPI is not set
CONFIG_SPI_DAVINCI=m
@@ -6883,7 +6881,6 @@ CONFIG_SPI_GPIO=m
# CONFIG_SPI_HISI_SFC_V3XX is not set
CONFIG_SPI_IMX=m
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index c596786da..b469393dd 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -2338,6 +2338,7 @@ CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NFORCE2_S4985=m
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PIIX4=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index aa41826c4..4891f3413 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -2321,6 +2321,7 @@ CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NFORCE2_S4985=m
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PIIX4=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 4c096b3e5..7e434821e 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -2172,6 +2172,7 @@ CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OPAL=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_QCOM_CCI is not set
@@ -2420,7 +2421,6 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
# CONFIG_INTEL_LDMA is not set
# CONFIG_INTEL_MEI_VIRTIO is not set
@@ -4165,7 +4165,6 @@ CONFIG_PAPR_SCM=m
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ALI=m
@@ -5856,7 +5855,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPI_AMD=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
@@ -5868,7 +5866,6 @@ CONFIG_SPI_FSL_LPSPI=m
# CONFIG_SPI_HISI_SFC_V3XX is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
# CONFIG_SPI_MTK_QUADSPI is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index b3e2e68f7..4ff59fe33 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1946,8 +1946,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OPAL=y
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_QCOM_CCI is not set
@@ -2178,7 +2177,6 @@ CONFIG_INTEGRITY=y
# CONFIG_INTEL_ATOMISP2_PM is not set
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_INT0002_VGPIO is not set
# CONFIG_INTEL_IOMMU_DEBUGFS is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
@@ -3743,14 +3741,8 @@ CONFIG_PANIC_TIMEOUT=180
# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PAPR_SCM is not set
# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PANEL is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_PATA_ACPI is not set
# CONFIG_PATA_ALI is not set
@@ -4017,7 +4009,6 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
CONFIG_PPS=y
CONFIG_PPTP=m
@@ -5300,7 +5291,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPI_AMD=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
@@ -5310,7 +5300,6 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_HISI_SFC_V3XX is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
# CONFIG_SPI_MUX is not set
@@ -5931,7 +5920,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
CONFIG_USB_SERIAL_MXUPORT=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 06c606b43..5e808eee0 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2155,6 +2155,7 @@ CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OPAL=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_QCOM_CCI is not set
@@ -2403,7 +2404,6 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
# CONFIG_INTEL_LDMA is not set
# CONFIG_INTEL_MEI_VIRTIO is not set
@@ -4142,7 +4142,6 @@ CONFIG_PAPR_SCM=m
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ALI=m
@@ -5831,7 +5830,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPI_AMD=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
@@ -5843,7 +5841,6 @@ CONFIG_SPI_FSL_LPSPI=m
# CONFIG_SPI_HISI_SFC_V3XX is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
# CONFIG_SPI_MTK_QUADSPI is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index ecae9d604..3aa996869 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1930,8 +1930,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OPAL=y
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_QCOM_CCI is not set
@@ -2162,7 +2161,6 @@ CONFIG_INTEGRITY=y
# CONFIG_INTEL_ATOMISP2_PM is not set
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_INT0002_VGPIO is not set
# CONFIG_INTEL_IOMMU_DEBUGFS is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
@@ -3726,14 +3724,8 @@ CONFIG_PANIC_TIMEOUT=180
# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PAPR_SCM is not set
# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PANEL is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_PATA_ACPI is not set
# CONFIG_PATA_ALI is not set
@@ -4000,7 +3992,6 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
CONFIG_PPS=y
CONFIG_PPTP=m
@@ -5281,7 +5272,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPI_AMD=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
@@ -5291,7 +5281,6 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_HISI_SFC_V3XX is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
# CONFIG_SPI_MUX is not set
@@ -5912,7 +5901,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
CONFIG_USB_SERIAL_MXUPORT=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index f6c5b191c..71245fa8d 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2154,6 +2154,7 @@ CONFIG_I2C_MUX_MLXCPLD=m
# CONFIG_I2C_NFORCE2_S4985 is not set
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_QCOM_CCI is not set
@@ -2399,7 +2400,6 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
# CONFIG_INTEL_LDMA is not set
# CONFIG_INTEL_MEI_VIRTIO is not set
@@ -4130,7 +4130,6 @@ CONFIG_PANTHERLORD_FF=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ALI=m
@@ -5795,7 +5794,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPI_AMD=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
@@ -5807,7 +5805,6 @@ CONFIG_SPI_FSL_LPSPI=m
# CONFIG_SPI_HISI_SFC_V3XX is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
# CONFIG_SPI_MTK_QUADSPI is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 2d1234e8b..98fefe25e 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1931,7 +1931,6 @@ CONFIG_I2C_MUX_MLXCPLD=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2156,7 +2155,6 @@ CONFIG_INTEGRITY=y
# CONFIG_INTEL_ATOMISP2_PM is not set
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_INT0002_VGPIO is not set
# CONFIG_INTEL_IOMMU_DEBUGFS is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
@@ -3718,14 +3716,8 @@ CONFIG_PAGE_TABLE_ISOLATION=y
CONFIG_PANIC_TIMEOUT=0
# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_PATA_ACPI is not set
# CONFIG_PATA_ALI is not set
@@ -3950,7 +3942,6 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
CONFIG_PPS=y
CONFIG_PPTP=m
@@ -5241,7 +5232,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPI_AMD=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
@@ -5251,7 +5241,6 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_HISI_SFC_V3XX is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
# CONFIG_SPI_MUX is not set
@@ -5880,7 +5869,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
CONFIG_USB_SERIAL_MXUPORT=m
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 29581177a..845b86cf8 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2137,6 +2137,7 @@ CONFIG_I2C_MUX_MLXCPLD=m
# CONFIG_I2C_NFORCE2_S4985 is not set
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_QCOM_CCI is not set
@@ -2382,7 +2383,6 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
# CONFIG_INTEL_LDMA is not set
# CONFIG_INTEL_MEI_VIRTIO is not set
@@ -4107,7 +4107,6 @@ CONFIG_PANTHERLORD_FF=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ALI=m
@@ -5770,7 +5769,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPI_AMD=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
@@ -5782,7 +5780,6 @@ CONFIG_SPI_FSL_LPSPI=m
# CONFIG_SPI_HISI_SFC_V3XX is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
# CONFIG_SPI_MTK_QUADSPI is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index baee453e0..3270d455b 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1915,7 +1915,6 @@ CONFIG_I2C_MUX_MLXCPLD=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2140,7 +2139,6 @@ CONFIG_INTEGRITY=y
# CONFIG_INTEL_ATOMISP2_PM is not set
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_INT0002_VGPIO is not set
# CONFIG_INTEL_IOMMU_DEBUGFS is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
@@ -3701,14 +3699,8 @@ CONFIG_PANIC_ON_OOPS=y
CONFIG_PANIC_TIMEOUT=0
# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_PATA_ACPI is not set
# CONFIG_PATA_ALI is not set
@@ -3933,7 +3925,6 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
CONFIG_PPS=y
CONFIG_PPTP=m
@@ -5222,7 +5213,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPI_AMD=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
@@ -5232,7 +5222,6 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_HISI_SFC_V3XX is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
# CONFIG_SPI_MUX is not set
@@ -5861,7 +5850,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
CONFIG_USB_SERIAL_MXUPORT=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 1e0904e18..45eaf79cf 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1930,7 +1930,6 @@ CONFIG_I2C_MUX_MLXCPLD=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2159,7 +2158,6 @@ CONFIG_INTEGRITY=y
# CONFIG_INTEL_ATOMISP2_PM is not set
# CONFIG_INTEL_IDMA64 is not set
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
# CONFIG_INTEL_INT0002_VGPIO is not set
# CONFIG_INTEL_IOMMU_DEBUGFS is not set
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
@@ -3724,14 +3722,8 @@ CONFIG_PANIC_ON_OOPS=y
CONFIG_PANIC_TIMEOUT=0
# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PANEL is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
# CONFIG_PATA_ACPI is not set
# CONFIG_PATA_ALI is not set
@@ -3956,7 +3948,6 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=y
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=y
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
CONFIG_PPS=y
CONFIG_PPTP=m
@@ -5251,7 +5242,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPI_AMD=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_DEBUG is not set
@@ -5261,7 +5251,6 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_HISI_SFC_V3XX is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LANTIQ_SSC is not set
-# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
# CONFIG_SPI_MUX is not set
@@ -5896,7 +5885,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
CONFIG_USB_SERIAL_MXUPORT=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 63c3fb042..a0b1d636e 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -2373,6 +2373,7 @@ CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NFORCE2_S4985=m
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PIIX4=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 032151535..d5fe99661 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -2078,7 +2078,7 @@ CONFIG_I2C_NFORCE2_S4985=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_PARPORT_LIGHT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PIIX4=m
@@ -2318,7 +2318,7 @@ CONFIG_INTEL_HID_EVENT=m
CONFIG_INTEL_IDLE=y
CONFIG_INTEL_IDMA64=m
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
+CONFIG_INTEL_IDXD_SVM=y
# CONFIG_INTEL_INT0002_VGPIO is not set
CONFIG_INTEL_IOATDMA=m
# CONFIG_INTEL_IOMMU_DEBUGFS is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index f172f018a..54b723903 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -2356,6 +2356,7 @@ CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NFORCE2_S4985=m
CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PIIX4=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index efffd6687..9115709c8 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -2062,7 +2062,7 @@ CONFIG_I2C_NFORCE2_S4985=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_PARPORT_LIGHT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PIIX4=m
@@ -2302,7 +2302,7 @@ CONFIG_INTEL_HID_EVENT=m
CONFIG_INTEL_IDLE=y
CONFIG_INTEL_IDMA64=m
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
+CONFIG_INTEL_IDXD_SVM=y
# CONFIG_INTEL_INT0002_VGPIO is not set
CONFIG_INTEL_IOATDMA=m
# CONFIG_INTEL_IOMMU_DEBUGFS is not set
diff --git a/kernel.spec b/kernel.spec
index fdb907028..3535b9476 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,7 +66,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc6.184
+%global distro_build 0.rc6.20210407git2d743660786e.185
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -107,13 +107,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.12.0
-%define pkgrelease 0.rc6.184
+%define pkgrelease 0.rc6.20210407git2d743660786e.185
# This is needed to do merge window version magic
%define patchlevel 12
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.184%{?buildid}%{?dist}
+%define specrelease 0.rc6.20210407git2d743660786e.185%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -203,7 +203,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.12
@@ -620,7 +620,7 @@ BuildRequires: clang
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.12-rc6.tar.xz
+Source0: linux-20210407git2d743660786e.tar.xz
Source1: Makefile.rhelver
@@ -1274,8 +1274,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.12-rc6 -c
-mv linux-5.12-rc6 linux-%{KVERREL}
+%setup -q -n kernel-20210407git2d743660786e -c
+mv linux-20210407git2d743660786e linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2789,6 +2789,11 @@ fi
#
#
%changelog
+* Wed Apr 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc6.20210407git2d743660786e.185]
+- common/ark: cleanup and unify the parport configs (Peter Robinson)
+- iommu/vt-d: enable INTEL_IDXD_SVM for both fedora and rhel (Jerry Snitselaar)
+- REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70 (Jeremy Linton)
+
* Wed Mar 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc5.20210331git2bb25b3a748a.181]
- configs/common/generic: disable CONFIG_SLAB_MERGE_DEFAULT (Rafael Aquini)
- Remove _legacy_common_support (Justin M. Forbes)
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch
index 020348cfc..ba5dd61fc 100644
--- a/patch-5.12.0-redhat.patch
+++ b/patch-5.12.0-redhat.patch
@@ -1,67 +1,68 @@
- Documentation/admin-guide/kdump/kdump.rst | 11 +
- Documentation/admin-guide/kernel-parameters.txt | 8 +
- Kconfig | 2 +
- Kconfig.redhat | 17 ++
- Makefile | 13 +-
- arch/arm/Kconfig | 4 +-
- arch/arm64/Kconfig | 3 +-
- arch/arm64/kernel/acpi.c | 4 +
- arch/s390/include/asm/ipl.h | 1 +
- arch/s390/kernel/ipl.c | 5 +
- arch/s390/kernel/setup.c | 4 +
- arch/x86/kernel/cpu/common.c | 1 +
- arch/x86/kernel/setup.c | 71 ++++--
- drivers/acpi/apei/hest.c | 8 +
- drivers/acpi/irq.c | 17 +-
- drivers/acpi/scan.c | 9 +
- drivers/ata/libahci.c | 18 ++
- drivers/char/ipmi/ipmi_dmi.c | 15 ++
- drivers/char/ipmi/ipmi_msghandler.c | 16 +-
- drivers/firmware/efi/Makefile | 1 +
- drivers/firmware/efi/efi.c | 124 +++++++---
- drivers/firmware/efi/secureboot.c | 38 +++
- drivers/hid/hid-rmi.c | 64 -----
- drivers/infiniband/sw/rxe/rxe.c | 2 +
- drivers/input/rmi4/rmi_driver.c | 124 ++++++----
- drivers/iommu/iommu.c | 22 ++
- drivers/message/fusion/mptsas.c | 10 +
- drivers/message/fusion/mptspi.c | 11 +
- drivers/net/ethernet/intel/ice/ice_main.c | 1 +
- drivers/pci/pci-driver.c | 29 +++
- drivers/pci/quirks.c | 24 ++
- drivers/scsi/aacraid/linit.c | 2 +
- drivers/scsi/be2iscsi/be_main.c | 2 +
- drivers/scsi/hpsa.c | 4 +
- drivers/scsi/lpfc/lpfc_ids.h | 14 ++
- drivers/scsi/megaraid/megaraid_sas_base.c | 2 +
- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +
- drivers/scsi/qla2xxx/qla_os.c | 6 +
- drivers/scsi/qla4xxx/ql4_os.c | 2 +
- drivers/scsi/smartpqi/smartpqi_init.c | 16 ++
- drivers/usb/core/hub.c | 7 +
- include/linux/efi.h | 22 +-
- include/linux/kernel.h | 34 ++-
- include/linux/lsm_hook_defs.h | 2 +
- include/linux/lsm_hooks.h | 6 +
- include/linux/module.h | 1 +
- include/linux/pci.h | 4 +
- include/linux/rh_kabi.h | 297 ++++++++++++++++++++++++
- include/linux/rmi.h | 1 +
- include/linux/security.h | 5 +
- kernel/Makefile | 1 +
- kernel/bpf/syscall.c | 27 ++-
- kernel/crash_core.c | 28 ++-
- kernel/module.c | 2 +
- kernel/module_signing.c | 9 +-
- kernel/panic.c | 14 ++
- kernel/rh_taint.c | 93 ++++++++
- scripts/mod/modpost.c | 8 +
- scripts/tags.sh | 2 +
- security/integrity/platform_certs/load_uefi.c | 6 +-
- security/lockdown/Kconfig | 13 ++
- security/lockdown/lockdown.c | 1 +
- security/security.c | 6 +
- 63 files changed, 1138 insertions(+), 180 deletions(-)
+ Documentation/admin-guide/kdump/kdump.rst | 11 +
+ Documentation/admin-guide/kernel-parameters.txt | 8 +
+ Kconfig | 2 +
+ Kconfig.redhat | 17 ++
+ Makefile | 13 +-
+ arch/arm/Kconfig | 4 +-
+ arch/arm64/Kconfig | 3 +-
+ arch/arm64/kernel/acpi.c | 4 +
+ arch/s390/include/asm/ipl.h | 1 +
+ arch/s390/kernel/ipl.c | 5 +
+ arch/s390/kernel/setup.c | 4 +
+ arch/x86/kernel/cpu/common.c | 1 +
+ arch/x86/kernel/setup.c | 71 ++++-
+ drivers/acpi/apei/hest.c | 8 +
+ drivers/acpi/irq.c | 17 +-
+ drivers/acpi/scan.c | 9 +
+ drivers/ata/libahci.c | 18 ++
+ drivers/char/ipmi/ipmi_dmi.c | 15 ++
+ drivers/char/ipmi/ipmi_msghandler.c | 16 +-
+ drivers/firmware/efi/Makefile | 1 +
+ drivers/firmware/efi/efi.c | 124 ++++++---
+ drivers/firmware/efi/secureboot.c | 38 +++
+ drivers/hid/hid-rmi.c | 64 -----
+ drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++
+ drivers/infiniband/sw/rxe/rxe.c | 2 +
+ drivers/input/rmi4/rmi_driver.c | 124 +++++----
+ drivers/iommu/iommu.c | 22 ++
+ drivers/message/fusion/mptsas.c | 10 +
+ drivers/message/fusion/mptspi.c | 11 +
+ drivers/net/ethernet/intel/ice/ice_main.c | 1 +
+ drivers/pci/pci-driver.c | 29 ++
+ drivers/pci/quirks.c | 24 ++
+ drivers/scsi/aacraid/linit.c | 2 +
+ drivers/scsi/be2iscsi/be_main.c | 2 +
+ drivers/scsi/hpsa.c | 4 +
+ drivers/scsi/lpfc/lpfc_ids.h | 14 +
+ drivers/scsi/megaraid/megaraid_sas_base.c | 2 +
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +
+ drivers/scsi/qla2xxx/qla_os.c | 6 +
+ drivers/scsi/qla4xxx/ql4_os.c | 2 +
+ drivers/scsi/smartpqi/smartpqi_init.c | 16 ++
+ drivers/usb/core/hub.c | 7 +
+ include/linux/efi.h | 22 +-
+ include/linux/kernel.h | 34 ++-
+ include/linux/lsm_hook_defs.h | 2 +
+ include/linux/lsm_hooks.h | 6 +
+ include/linux/module.h | 1 +
+ include/linux/pci.h | 4 +
+ include/linux/rh_kabi.h | 297 +++++++++++++++++++++
+ include/linux/rmi.h | 1 +
+ include/linux/security.h | 5 +
+ kernel/Makefile | 1 +
+ kernel/bpf/syscall.c | 27 +-
+ kernel/crash_core.c | 28 +-
+ kernel/module.c | 2 +
+ kernel/module_signing.c | 9 +-
+ kernel/panic.c | 14 +
+ kernel/rh_taint.c | 93 +++++++
+ scripts/mod/modpost.c | 8 +
+ scripts/tags.sh | 2 +
+ security/integrity/platform_certs/load_uefi.c | 6 +-
+ security/lockdown/Kconfig | 13 +
+ security/lockdown/lockdown.c | 1 +
+ security/security.c | 6 +
+ 64 files changed, 1157 insertions(+), 180 deletions(-)
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
index 75a9dd98e76e..3ff3291551f9 100644
@@ -877,6 +878,57 @@ index 311eee599ce9..2460c6bd46f8 100644
data->xport.proto_name = "hid";
data->xport.ops = &hid_rmi_ops;
+diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
+index 15016f757828..59326b940b3a 100644
+--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
++++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
+@@ -9,6 +9,7 @@
+ #include <linux/init.h>
+ #include <linux/types.h>
+ #include <linux/device.h>
++#include <linux/dmi.h>
+ #include <linux/io.h>
+ #include <linux/err.h>
+ #include <linux/fs.h>
+@@ -1963,6 +1964,16 @@ static const struct amba_id etm4_ids[] = {
+ {},
+ };
+
++static const struct dmi_system_id broken_coresight[] = {
++ {
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "HPE"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "Apollo 70"),
++ },
++ },
++ { } /* terminating entry */
++};
++
+ MODULE_DEVICE_TABLE(amba, etm4_ids);
+
+ static struct amba_driver etm4x_amba_driver = {
+@@ -1995,6 +2006,11 @@ static int __init etm4x_init(void)
+ {
+ int ret;
+
++ if (dmi_check_system(broken_coresight)) {
++ pr_info("ETM4 disabled due to firmware bug\n");
++ return 0;
++ }
++
+ ret = etm4_pm_setup();
+
+ /* etm4_pm_setup() does its own cleanup - exit on error */
+@@ -2021,6 +2037,9 @@ static int __init etm4x_init(void)
+
+ static void __exit etm4x_exit(void)
+ {
++ if (dmi_check_system(broken_coresight))
++ return;
++
+ amba_driver_unregister(&etm4x_amba_driver);
+ platform_driver_unregister(&etm4_platform_driver);
+ etm4_pm_clear();
diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
index 95f0de0c8b49..faa8a6cadef1 100644
--- a/drivers/infiniband/sw/rxe/rxe.c
diff --git a/sources b/sources
index 18ce5db00..4db3bd9ad 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.12-rc6.tar.xz) = f33b8e96aad6b415f4ccafff027725e872039eec4985c6223a51b80da42297ae7ea5325cf4e9bc1a3c17fbdb943ea43760e1674d94f4a51699b8848f0d031363
-SHA512 (kernel-abi-whitelists-5.12.0-0.rc6.184.tar.bz2) = 36a5eb676375f8fc1cf78f36ed0084955b4297409817eda8f3fea4052502d1d732ee9752067b5616f1a00f47402eb3fc207ca53cc6ca14a7196460e0834fe1bf
-SHA512 (kernel-kabi-dw-5.12.0-0.rc6.184.tar.bz2) = ad9953764e8023b640906bd5f1a9cd14f135f0d960b1e41a7bd80e2d1fc7832585da17ac6a5f8d9aa3a14a6845af63ae161d65aa18f998ec9d59b05388f42e78
+SHA512 (linux-20210407git2d743660786e.tar.xz) = cf33381f42870ce6a2f7e99a26ee694f6126e7b16b3052d875b5d304cf2aa2d00b3016d152d534bf62aff5bfbe67dcd1c96c5840116523b3e5d478eab47479e9
+SHA512 (kernel-abi-whitelists-5.12.0-0.rc6.20210407git2d743660786e.185.tar.bz2) = f4d479823c9dfc3caaed18069bde723568199bd24b163a0984c1e91952abcb983b0e9844f90d4ce3b56cbcc919f827d66973b5a1341f89b6e4ffe03e8630b40a
+SHA512 (kernel-kabi-dw-5.12.0-0.rc6.20210407git2d743660786e.185.tar.bz2) = 2c0df0b954dc7d03cbb3e9d6a06df22ff1353b09fbc5bd4b2aefa9ff97c344ffa6a093b54b65aeac311bbcbf80da22237fe1d1a8f7bcd89ddcf3d0e204b48f9e