Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc2.114.vanilla.1.fc33kernel-5.11.0-0.rc2.114.vanilla.1.fc32

24 files changed, 39 insertions, 203 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 645a512f2..0feba152e 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 = 109
+RHEL_RELEASE = 114
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 105444a96..2a33d82bb 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -873,7 +873,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CAN_DEBUG_DEVICES=y
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
-# CONFIG_CAN_EMS_PCMCIA is not set
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 # CONFIG_CAN_F81601 is not set
@@ -899,7 +898,6 @@ CONFIG_CAN_MCP251X=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_PEAK_PCI=m
-# CONFIG_CAN_PEAK_PCMCIA is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_RAW=m
@@ -3271,6 +3269,7 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KASAN_GENERIC=y
+CONFIG_KASAN_HW_TAGS=y
 CONFIG_KASAN_INLINE=y
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_SW_TAGS is not set
@@ -4852,7 +4851,6 @@ CONFIG_PATA_MARVELL=m
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_OPTIDMA is not set
 # CONFIG_PATA_OPTI is not set
-CONFIG_PATA_PCMCIA=m
 # CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_PLATFORM is not set
@@ -4941,19 +4939,7 @@ CONFIG_PCI_TEGRA=y
 CONFIG_PCI_XGENE_MSI=y
 CONFIG_PCI_XGENE=y
 CONFIG_PCI=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_HERMES=m
 # CONFIG_PCMCIA is not set
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-# CONFIG_PCMCIA_RAYCS is not set
-CONFIG_PCMCIA_SMC91C92=m
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_PCNET32=m
 CONFIG_PCS_XPCS=m
@@ -5910,7 +5896,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
@@ -6494,7 +6479,6 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXFW=m
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
@@ -6938,7 +6922,6 @@ CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKLEAK_METRICS=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 63df98680..68567baed 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2599,6 +2599,7 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_KALLSYMS=y
 # CONFIG_KARMA_PARTITION is not set
 CONFIG_KASAN_GENERIC=y
+CONFIG_KASAN_HW_TAGS=y
 CONFIG_KASAN_INLINE=y
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_SW_TAGS is not set
@@ -4659,7 +4660,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_ISCI is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index e78208fa4..67712ed58 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -873,7 +873,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 # CONFIG_CAN_DEBUG_DEVICES is not set
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
-# CONFIG_CAN_EMS_PCMCIA is not set
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 # CONFIG_CAN_F81601 is not set
@@ -899,7 +898,6 @@ CONFIG_CAN_MCP251X=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_PEAK_PCI=m
-# CONFIG_CAN_PEAK_PCMCIA is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_RAW=m
@@ -4830,7 +4828,6 @@ CONFIG_PATA_MARVELL=m
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_OPTIDMA is not set
 # CONFIG_PATA_OPTI is not set
-CONFIG_PATA_PCMCIA=m
 # CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_PLATFORM is not set
@@ -4919,19 +4916,7 @@ CONFIG_PCI_TEGRA=y
 CONFIG_PCI_XGENE_MSI=y
 CONFIG_PCI_XGENE=y
 CONFIG_PCI=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_HERMES=m
 # CONFIG_PCMCIA is not set
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-# CONFIG_PCMCIA_RAYCS is not set
-CONFIG_PCMCIA_SMC91C92=m
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_PCNET32=m
 CONFIG_PCS_XPCS=m
@@ -5888,7 +5873,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
@@ -6472,7 +6456,6 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXFW=m
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCXHR=m
@@ -6914,7 +6897,6 @@ CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKLEAK_METRICS=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 56b6b457c..71a3932f0 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -4639,7 +4639,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_ISCI is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 858b977df..e3b7d3b58 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -877,7 +877,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CAN_DEBUG_DEVICES=y
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
-# CONFIG_CAN_EMS_PCMCIA is not set
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 # CONFIG_CAN_F81601 is not set
@@ -903,7 +902,6 @@ CONFIG_CAN_MCP251X=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_PEAK_PCI=m
-# CONFIG_CAN_PEAK_PCMCIA is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_RAW=m
@@ -4944,7 +4942,6 @@ CONFIG_PATA_MARVELL=m
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_OPTIDMA is not set
 # CONFIG_PATA_OPTI is not set
-CONFIG_PATA_PCMCIA=m
 # CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_PLATFORM is not set
@@ -5022,19 +5019,7 @@ CONFIG_PCI_SW_SWITCHTEC=m
 CONFIG_PCI_TEGRA=y
 CONFIG_PCI_V3_SEMI=y
 CONFIG_PCI=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_HERMES=m
 # CONFIG_PCMCIA is not set
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-# CONFIG_PCMCIA_RAYCS is not set
-CONFIG_PCMCIA_SMC91C92=m
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_PCNET32=m
 CONFIG_PCS_XPCS=m
@@ -6030,7 +6015,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
@@ -6629,7 +6613,6 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXFW=m
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
@@ -7131,7 +7114,6 @@ CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKLEAK_METRICS=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 3a8fff0aa..2b2a4bef2 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -877,7 +877,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 # CONFIG_CAN_DEBUG_DEVICES is not set
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
-# CONFIG_CAN_EMS_PCMCIA is not set
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 # CONFIG_CAN_F81601 is not set
@@ -903,7 +902,6 @@ CONFIG_CAN_MCP251X=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_PEAK_PCI=m
-# CONFIG_CAN_PEAK_PCMCIA is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_RAW=m
@@ -4925,7 +4923,6 @@ CONFIG_PATA_MARVELL=m
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_OPTIDMA is not set
 # CONFIG_PATA_OPTI is not set
-CONFIG_PATA_PCMCIA=m
 # CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_PLATFORM is not set
@@ -5003,19 +5000,7 @@ CONFIG_PCI_SW_SWITCHTEC=m
 CONFIG_PCI_TEGRA=y
 CONFIG_PCI_V3_SEMI=y
 CONFIG_PCI=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_HERMES=m
 # CONFIG_PCMCIA is not set
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-# CONFIG_PCMCIA_RAYCS is not set
-CONFIG_PCMCIA_SMC91C92=m
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_PCNET32=m
 CONFIG_PCS_XPCS=m
@@ -6011,7 +5996,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
@@ -6610,7 +6594,6 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXFW=m
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCXHR=m
@@ -7110,7 +7093,6 @@ CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKLEAK_METRICS=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index ba8034626..bbd6707a5 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -855,7 +855,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CAN_DEBUG_DEVICES=y
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
-# CONFIG_CAN_EMS_PCMCIA is not set
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 # CONFIG_CAN_F81601 is not set
@@ -881,7 +880,6 @@ CONFIG_CAN_MCP251X=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_PEAK_PCI=m
-# CONFIG_CAN_PEAK_PCMCIA is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_RAW=m
@@ -4833,7 +4831,6 @@ CONFIG_PATA_MARVELL=m
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_OPTIDMA is not set
 # CONFIG_PATA_OPTI is not set
-CONFIG_PATA_PCMCIA=m
 # CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_PLATFORM is not set
@@ -4911,19 +4908,7 @@ CONFIG_PCI_SW_SWITCHTEC=m
 CONFIG_PCI_TEGRA=y
 CONFIG_PCI_V3_SEMI=y
 CONFIG_PCI=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_HERMES=m
 # CONFIG_PCMCIA is not set
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-# CONFIG_PCMCIA_RAYCS is not set
-CONFIG_PCMCIA_SMC91C92=m
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_PCNET32=m
 CONFIG_PCS_XPCS=m
@@ -5847,7 +5832,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
@@ -6434,7 +6418,6 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXFW=m
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
@@ -6891,7 +6874,6 @@ CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKLEAK_METRICS=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 484152156..ef44d8351 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -855,7 +855,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 # CONFIG_CAN_DEBUG_DEVICES is not set
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
-# CONFIG_CAN_EMS_PCMCIA is not set
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 # CONFIG_CAN_F81601 is not set
@@ -881,7 +880,6 @@ CONFIG_CAN_MCP251X=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_PEAK_PCI=m
-# CONFIG_CAN_PEAK_PCMCIA is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_RAW=m
@@ -4814,7 +4812,6 @@ CONFIG_PATA_MARVELL=m
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_OPTIDMA is not set
 # CONFIG_PATA_OPTI is not set
-CONFIG_PATA_PCMCIA=m
 # CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_PLATFORM is not set
@@ -4892,19 +4889,7 @@ CONFIG_PCI_SW_SWITCHTEC=m
 CONFIG_PCI_TEGRA=y
 CONFIG_PCI_V3_SEMI=y
 CONFIG_PCI=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_HERMES=m
 # CONFIG_PCMCIA is not set
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-# CONFIG_PCMCIA_RAYCS is not set
-CONFIG_PCMCIA_SMC91C92=m
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_PCNET32=m
 CONFIG_PCS_XPCS=m
@@ -5828,7 +5813,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
@@ -6415,7 +6399,6 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXFW=m
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCXHR=m
@@ -6870,7 +6853,6 @@ CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKLEAK_METRICS=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index bcbe6b2be..28c927f44 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -646,7 +646,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CAN_DEBUG_DEVICES=y
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
-# CONFIG_CAN_EMS_PCMCIA is not set
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 # CONFIG_CAN_F81601 is not set
@@ -673,7 +672,6 @@ CONFIG_CAN_MCBA_USB=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_PEAK_PCI=m
-# CONFIG_CAN_PEAK_PCMCIA is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_RAW=m
@@ -4151,7 +4149,6 @@ CONFIG_PATA_NS87415=m
 # CONFIG_PATA_OLDPIIX is not set
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_PDC_OLD=m
 # CONFIG_PATA_PLATFORM is not set
@@ -4214,20 +4211,8 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_STUB=y
 CONFIG_PCI_SW_SWITCHTEC=m
 CONFIG_PCI=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-# CONFIG_PCMCIA_RAYCS is not set
-CONFIG_PCMCIA_SMC91C92=m
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_PCMCIA_XIRC2PS=m
+# CONFIG_PCMCIA is not set
 CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCMCIA=y
 CONFIG_PCNET32=m
 CONFIG_PCS_XPCS=m
 CONFIG_PD6729=m
@@ -4987,7 +4972,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
@@ -5510,7 +5494,6 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXFW=m
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
@@ -5855,7 +5838,6 @@ CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKLEAK_METRICS=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 920482b57..e386afb03 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -4499,7 +4499,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_ISCI is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 69574fe81..a4948576a 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -645,7 +645,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 # CONFIG_CAN_DEBUG_DEVICES is not set
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
-# CONFIG_CAN_EMS_PCMCIA is not set
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 # CONFIG_CAN_F81601 is not set
@@ -672,7 +671,6 @@ CONFIG_CAN_MCBA_USB=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_PEAK_PCI=m
-# CONFIG_CAN_PEAK_PCMCIA is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_RAW=m
@@ -4130,7 +4128,6 @@ CONFIG_PATA_NS87415=m
 # CONFIG_PATA_OLDPIIX is not set
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_PDC_OLD=m
 # CONFIG_PATA_PLATFORM is not set
@@ -4193,20 +4190,8 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_STUB=y
 CONFIG_PCI_SW_SWITCHTEC=m
 CONFIG_PCI=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-# CONFIG_PCMCIA_RAYCS is not set
-CONFIG_PCMCIA_SMC91C92=m
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_PCMCIA_XIRC2PS=m
+# CONFIG_PCMCIA is not set
 CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCMCIA=y
 CONFIG_PCNET32=m
 CONFIG_PCS_XPCS=m
 CONFIG_PD6729=m
@@ -4966,7 +4951,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
@@ -5489,7 +5473,6 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXFW=m
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCXHR=m
@@ -5832,7 +5815,6 @@ CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB=m
 CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKLEAK_METRICS=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 62a85f8c6..3dc3b3a17 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -4482,7 +4482,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_ISCI is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index d6cfdc777..c5053ca55 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -650,7 +650,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CAN_DEBUG_DEVICES=y
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
-# CONFIG_CAN_EMS_PCMCIA is not set
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 # CONFIG_CAN_F81601 is not set
@@ -676,7 +675,6 @@ CONFIG_CAN_MCBA_USB=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_PEAK_PCI=m
-# CONFIG_CAN_PEAK_PCMCIA is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_RAW=m
@@ -4116,7 +4114,6 @@ CONFIG_PATA_NS87415=m
 # CONFIG_PATA_OLDPIIX is not set
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_PDC_OLD=m
 # CONFIG_PATA_RADISYS is not set
@@ -4179,19 +4176,7 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_STUB=y
 CONFIG_PCI_SW_SWITCHTEC=m
 CONFIG_PCI=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_HERMES=m
 # CONFIG_PCMCIA is not set
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-# CONFIG_PCMCIA_RAYCS is not set
-CONFIG_PCMCIA_SMC91C92=m
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_PCNET32=m
 CONFIG_PCS_XPCS=m
@@ -4933,7 +4918,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 # CONFIG_SCSI_LPFC is not set
@@ -5453,7 +5437,6 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXFW=m
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
@@ -5794,7 +5777,6 @@ CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 # CONFIG_SSB is not set
 CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKLEAK_METRICS=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 2ccbede72..0b7e66a47 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -4448,7 +4448,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_ISCI is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 # CONFIG_SCSI_LPFC is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index bdb75e66d..66c7f4b24 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -649,7 +649,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 # CONFIG_CAN_DEBUG_DEVICES is not set
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
-# CONFIG_CAN_EMS_PCMCIA is not set
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 # CONFIG_CAN_F81601 is not set
@@ -675,7 +674,6 @@ CONFIG_CAN_MCBA_USB=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_PEAK_PCI=m
-# CONFIG_CAN_PEAK_PCMCIA is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_RAW=m
@@ -4095,7 +4093,6 @@ CONFIG_PATA_NS87415=m
 # CONFIG_PATA_OLDPIIX is not set
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_PDC_OLD=m
 # CONFIG_PATA_RADISYS is not set
@@ -4158,19 +4155,7 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_STUB=y
 CONFIG_PCI_SW_SWITCHTEC=m
 CONFIG_PCI=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_HERMES=m
 # CONFIG_PCMCIA is not set
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-# CONFIG_PCMCIA_RAYCS is not set
-CONFIG_PCMCIA_SMC91C92=m
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_PCNET32=m
 CONFIG_PCS_XPCS=m
@@ -4912,7 +4897,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 # CONFIG_SCSI_LPFC is not set
@@ -5432,7 +5416,6 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXFW=m
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCXHR=m
@@ -5771,7 +5754,6 @@ CONFIG_SSB_DRIVER_GPIO=y
 CONFIG_SSB_DRIVER_PCICORE=y
 # CONFIG_SSB is not set
 CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKLEAK_METRICS=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index c086efc51..3972c2cb6 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -4431,7 +4431,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_ISCI is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 # CONFIG_SCSI_LPFC is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 86d1945c9..44f80c254 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -4458,7 +4458,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_ISCI is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 # CONFIG_SCSI_LPFC is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index e7397b124..975e3af90 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -4657,7 +4657,6 @@ CONFIG_SCSI_HPSA=m
 # CONFIG_SCSI_ISCI is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index cd6e7fe74..3fbcfa9ae 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -4637,7 +4637,6 @@ CONFIG_SCSI_HPSA=m
 # CONFIG_SCSI_ISCI is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_LPFC=m
diff --git a/kernel.spec b/kernel.spec
index 7bc23fbec..f9adc5692 100755
--- 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.rc1.20201229gitdea8dcf2a9fa.109
+%global distro_build 0.rc2.114
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -99,13 +99,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.11.0
-%define pkgrelease 0.rc1.20201229gitdea8dcf2a9fa.109
+%define pkgrelease 0.rc2.114
 
 # This is needed to do merge window version magic
 %define patchlevel 11
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20201229gitdea8dcf2a9fa.109%{?buildid}%{?dist}
+%define specrelease 0.rc2.114%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -507,7 +507,7 @@ BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++
 BuildRequires: net-tools, hostname, bc, elfutils-devel
 BuildRequires: dwarves
 BuildRequires: python3-devel
-BuildRequires: gcc-plugin-devel
+BuildRequires: gcc-plugin-devel, gcc-c++
 %if %{with_headers}
 BuildRequires: rsync
 %endif
@@ -593,7 +593,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20201229gitdea8dcf2a9fa.tar.xz
+Source0: linux-5.11-rc2.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -743,6 +743,7 @@ Source4000: README.rst
 %if !%{nopatches}
 
 Patch1: patch-%{rpmversion}-redhat.patch
+Patch2: secureboot_merge_fix.patch
 %endif
 
 # empty final patch to facilitate testing of kernel patches
@@ -1237,8 +1238,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20201229gitdea8dcf2a9fa -c
-mv linux-20201229gitdea8dcf2a9fa linux-%{KVERREL}
+%setup -q -n kernel-5.11-rc2 -c
+mv linux-5.11-rc2 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -1246,6 +1247,7 @@ cd linux-%{KVERREL}
 %if !%{nopatches}
 
 ApplyOptionalPatch patch-%{rpmversion}-redhat.patch
+ApplyOptionalPatch secureboot_merge_fix.patch
 %endif
 
 ApplyOptionalPatch linux-kernel-test.patch
@@ -2716,6 +2718,9 @@ fi
 #
 #
 %changelog
+* Sun Jan 03 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc1.20210103giteda809aef534.113]
+- Fedora: cleanup PCMCIA configs, move to x86 (Peter Robinson)
+
 * Wed Dec 23 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc0.20201223git614cb5894306.107]
 - New configs in drivers/rtc (Fedora Kernel Team)
 - redhat/configs: Enable CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL (Josh Poimboeuf)
diff --git a/patch-5.11.0-redhat.patch b/patch-5.11.0-redhat.patch
index 6123c55cf..ef39ebe1c 100644
--- a/patch-5.11.0-redhat.patch
+++ b/patch-5.11.0-redhat.patch
@@ -202,7 +202,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index 3d328b7ab200..934b3f566c86 100644
+index 8b2c3f88ee5e..2cb8050ffd0d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/secureboot_merge_fix.patch b/secureboot_merge_fix.patch
new file mode 100644
index 000000000..d67a4b7ca
--- /dev/null
+++ b/secureboot_merge_fix.patch
@@ -0,0 +1,18 @@
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index 03cb4259200d..4c55e3aa7e95 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -1096,13 +1096,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
+ extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
+ extern unsigned long efi_call_virt_save_flags(void);
+
+-enum efi_secureboot_mode {
+-	efi_secureboot_mode_unset,
+-	efi_secureboot_mode_unknown,
+-	efi_secureboot_mode_disabled,
+-	efi_secureboot_mode_enabled,
+-};
+-
+ static inline
+ enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var)
+ {
diff --git a/sources b/sources
index 9f4a2b5a6..43f1d1e38 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20201229gitdea8dcf2a9fa.tar.xz) = 96772975d85e15b033c0fcc49a78c18e97d16044aa32174e8f89ee4b2e2577b0ef50bf186c7aff82cf59500ce07dc5d8818d0549885d36219870a672e122abaf
-SHA512 (kernel-abi-whitelists-5.11.0-0.rc1.20201229gitdea8dcf2a9fa.109.tar.bz2) = ab66ed60783fd6e11f2ab61d6b527b2ab9692daba55e8334666ab5b6932d62ac5fca57b21c91bb0ff5d17c0b53c3f6761e7e3765508e5f4566b45e7049ba0dfc
-SHA512 (kernel-kabi-dw-5.11.0-0.rc1.20201229gitdea8dcf2a9fa.109.tar.bz2) = 6725c03046a43af4dd931408617107208da49e599d25e986166d54b3d0ce191dee19938c30c6054af5f9f4a0985c35f1a4e6a6493ff9b8b105a110d73b5863b0
+SHA512 (linux-5.11-rc2.tar.xz) = 293d5607b815e0be40528a691b10ff301df954685b47c11ea7bfb21f7e42541999801164e9a0b9eb4d80ca8337ec38b46e0ce0c960913fc7bf42a36d7f4b0b78
+SHA512 (kernel-abi-whitelists-5.11.0-0.rc2.114.tar.bz2) = 462c48012955712bcd55c58849e3ba04563472393b3923d3081e500043ff95c77f7baeb7844cd09a04a94f478cd200a444f92eaa0864b6366faa0c41036cd5d8
+SHA512 (kernel-kabi-dw-5.11.0-0.rc2.114.tar.bz2) = 738c307e6acac85b373697b6de5facaf3c67feeeb0ace3d115a30534e30327f13ca74feda9f4b5ac73143f4d1a4fe44b553a99d75c9e1f76af6ff1fe27b2cc66