kernel-5.11.0-0.rc1.20210103giteda809aef534.113

* 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)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2021-01-04 12:24:18 -06:00
parent a260e87234
commit a7f5e8cd7c
23 changed files with 17 additions and 203 deletions

View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 109 RHEL_RELEASE = 114
# #
# Early y+1 numbering # Early y+1 numbering

View File

@ -873,7 +873,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
CONFIG_CAN_DEBUG_DEVICES=y CONFIG_CAN_DEBUG_DEVICES=y
CONFIG_CAN_DEV=m CONFIG_CAN_DEV=m
CONFIG_CAN_EMS_PCI=m CONFIG_CAN_EMS_PCI=m
# CONFIG_CAN_EMS_PCMCIA is not set
CONFIG_CAN_EMS_USB=m CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m CONFIG_CAN_ESD_USB2=m
# CONFIG_CAN_F81601 is not set # CONFIG_CAN_F81601 is not set
@ -899,7 +898,6 @@ CONFIG_CAN_MCP251X=m
CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCIEFD=m
CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCI=m
# CONFIG_CAN_PEAK_PCMCIA is not set
CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_PLX_PCI=m CONFIG_CAN_PLX_PCI=m
CONFIG_CAN_RAW=m CONFIG_CAN_RAW=m
@ -4852,7 +4850,6 @@ CONFIG_PATA_MARVELL=m
# CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTI is not set
CONFIG_PATA_PCMCIA=m
# CONFIG_PATA_PDC2027X is not set # CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_PLATFORM is not set
@ -4941,19 +4938,7 @@ CONFIG_PCI_TEGRA=y
CONFIG_PCI_XGENE_MSI=y CONFIG_PCI_XGENE_MSI=y
CONFIG_PCI_XGENE=y CONFIG_PCI_XGENE=y
CONFIG_PCI=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 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_PCMCIA_XIRCOM=m
CONFIG_PCNET32=m CONFIG_PCNET32=m
CONFIG_PCS_XPCS=m CONFIG_PCS_XPCS=m
@ -5910,7 +5895,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set # CONFIG_SCSI_IPS is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m
@ -6494,7 +6478,6 @@ CONFIG_SND_OSSEMUL=y
CONFIG_SND_OXFW=m CONFIG_SND_OXFW=m
CONFIG_SND_OXYGEN=m CONFIG_SND_OXYGEN=m
CONFIG_SND_PCI=y CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCM_XRUN_DEBUG=y CONFIG_SND_PCM_XRUN_DEBUG=y
@ -6938,7 +6921,6 @@ CONFIG_SSB_DRIVER_GPIO=y
CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB=m CONFIG_SSB=m
CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST=y CONFIG_SSB_SDIOHOST=y
# CONFIG_SSFDC is not set # CONFIG_SSFDC is not set
CONFIG_STACKLEAK_METRICS=y CONFIG_STACKLEAK_METRICS=y

View File

@ -4659,7 +4659,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_ISCI is not set # CONFIG_SCSI_ISCI is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m

View File

@ -873,7 +873,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
# CONFIG_CAN_DEBUG_DEVICES is not set # CONFIG_CAN_DEBUG_DEVICES is not set
CONFIG_CAN_DEV=m CONFIG_CAN_DEV=m
CONFIG_CAN_EMS_PCI=m CONFIG_CAN_EMS_PCI=m
# CONFIG_CAN_EMS_PCMCIA is not set
CONFIG_CAN_EMS_USB=m CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m CONFIG_CAN_ESD_USB2=m
# CONFIG_CAN_F81601 is not set # CONFIG_CAN_F81601 is not set
@ -899,7 +898,6 @@ CONFIG_CAN_MCP251X=m
CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCIEFD=m
CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCI=m
# CONFIG_CAN_PEAK_PCMCIA is not set
CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_PLX_PCI=m CONFIG_CAN_PLX_PCI=m
CONFIG_CAN_RAW=m CONFIG_CAN_RAW=m
@ -4830,7 +4828,6 @@ CONFIG_PATA_MARVELL=m
# CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTI is not set
CONFIG_PATA_PCMCIA=m
# CONFIG_PATA_PDC2027X is not set # CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_PLATFORM 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_MSI=y
CONFIG_PCI_XGENE=y CONFIG_PCI_XGENE=y
CONFIG_PCI=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 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_PCMCIA_XIRCOM=m
CONFIG_PCNET32=m CONFIG_PCNET32=m
CONFIG_PCS_XPCS=m CONFIG_PCS_XPCS=m
@ -5888,7 +5873,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set # CONFIG_SCSI_IPS is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m
@ -6472,7 +6456,6 @@ CONFIG_SND_OSSEMUL=y
CONFIG_SND_OXFW=m CONFIG_SND_OXFW=m
CONFIG_SND_OXYGEN=m CONFIG_SND_OXYGEN=m
CONFIG_SND_PCI=y CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCXHR=m CONFIG_SND_PCXHR=m
@ -6914,7 +6897,6 @@ CONFIG_SSB_DRIVER_GPIO=y
CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB=m CONFIG_SSB=m
CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST=y CONFIG_SSB_SDIOHOST=y
# CONFIG_SSFDC is not set # CONFIG_SSFDC is not set
CONFIG_STACKLEAK_METRICS=y CONFIG_STACKLEAK_METRICS=y

View File

@ -4639,7 +4639,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_ISCI is not set # CONFIG_SCSI_ISCI is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m

View File

@ -877,7 +877,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
CONFIG_CAN_DEBUG_DEVICES=y CONFIG_CAN_DEBUG_DEVICES=y
CONFIG_CAN_DEV=m CONFIG_CAN_DEV=m
CONFIG_CAN_EMS_PCI=m CONFIG_CAN_EMS_PCI=m
# CONFIG_CAN_EMS_PCMCIA is not set
CONFIG_CAN_EMS_USB=m CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m CONFIG_CAN_ESD_USB2=m
# CONFIG_CAN_F81601 is not set # CONFIG_CAN_F81601 is not set
@ -903,7 +902,6 @@ CONFIG_CAN_MCP251X=m
CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCIEFD=m
CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCI=m
# CONFIG_CAN_PEAK_PCMCIA is not set
CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_PLX_PCI=m CONFIG_CAN_PLX_PCI=m
CONFIG_CAN_RAW=m CONFIG_CAN_RAW=m
@ -4944,7 +4942,6 @@ CONFIG_PATA_MARVELL=m
# CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTI is not set
CONFIG_PATA_PCMCIA=m
# CONFIG_PATA_PDC2027X is not set # CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_PLATFORM is not set
@ -5022,19 +5019,7 @@ CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI_TEGRA=y CONFIG_PCI_TEGRA=y
CONFIG_PCI_V3_SEMI=y CONFIG_PCI_V3_SEMI=y
CONFIG_PCI=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 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_PCMCIA_XIRCOM=m
CONFIG_PCNET32=m CONFIG_PCNET32=m
CONFIG_PCS_XPCS=m CONFIG_PCS_XPCS=m
@ -6030,7 +6015,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set # CONFIG_SCSI_IPS is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m
@ -6629,7 +6613,6 @@ CONFIG_SND_OSSEMUL=y
CONFIG_SND_OXFW=m CONFIG_SND_OXFW=m
CONFIG_SND_OXYGEN=m CONFIG_SND_OXYGEN=m
CONFIG_SND_PCI=y CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCM_XRUN_DEBUG=y CONFIG_SND_PCM_XRUN_DEBUG=y
@ -7131,7 +7114,6 @@ CONFIG_SSB_DRIVER_GPIO=y
CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB=m CONFIG_SSB=m
CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST=y CONFIG_SSB_SDIOHOST=y
# CONFIG_SSFDC is not set # CONFIG_SSFDC is not set
CONFIG_STACKLEAK_METRICS=y CONFIG_STACKLEAK_METRICS=y

View File

@ -877,7 +877,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
# CONFIG_CAN_DEBUG_DEVICES is not set # CONFIG_CAN_DEBUG_DEVICES is not set
CONFIG_CAN_DEV=m CONFIG_CAN_DEV=m
CONFIG_CAN_EMS_PCI=m CONFIG_CAN_EMS_PCI=m
# CONFIG_CAN_EMS_PCMCIA is not set
CONFIG_CAN_EMS_USB=m CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m CONFIG_CAN_ESD_USB2=m
# CONFIG_CAN_F81601 is not set # CONFIG_CAN_F81601 is not set
@ -903,7 +902,6 @@ CONFIG_CAN_MCP251X=m
CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCIEFD=m
CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCI=m
# CONFIG_CAN_PEAK_PCMCIA is not set
CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_PLX_PCI=m CONFIG_CAN_PLX_PCI=m
CONFIG_CAN_RAW=m CONFIG_CAN_RAW=m
@ -4925,7 +4923,6 @@ CONFIG_PATA_MARVELL=m
# CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTI is not set
CONFIG_PATA_PCMCIA=m
# CONFIG_PATA_PDC2027X is not set # CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_PLATFORM is not set
@ -5003,19 +5000,7 @@ CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI_TEGRA=y CONFIG_PCI_TEGRA=y
CONFIG_PCI_V3_SEMI=y CONFIG_PCI_V3_SEMI=y
CONFIG_PCI=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 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_PCMCIA_XIRCOM=m
CONFIG_PCNET32=m CONFIG_PCNET32=m
CONFIG_PCS_XPCS=m CONFIG_PCS_XPCS=m
@ -6011,7 +5996,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set # CONFIG_SCSI_IPS is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m
@ -6610,7 +6594,6 @@ CONFIG_SND_OSSEMUL=y
CONFIG_SND_OXFW=m CONFIG_SND_OXFW=m
CONFIG_SND_OXYGEN=m CONFIG_SND_OXYGEN=m
CONFIG_SND_PCI=y CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCXHR=m CONFIG_SND_PCXHR=m
@ -7110,7 +7093,6 @@ CONFIG_SSB_DRIVER_GPIO=y
CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB=m CONFIG_SSB=m
CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST=y CONFIG_SSB_SDIOHOST=y
# CONFIG_SSFDC is not set # CONFIG_SSFDC is not set
CONFIG_STACKLEAK_METRICS=y CONFIG_STACKLEAK_METRICS=y

View File

@ -855,7 +855,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
CONFIG_CAN_DEBUG_DEVICES=y CONFIG_CAN_DEBUG_DEVICES=y
CONFIG_CAN_DEV=m CONFIG_CAN_DEV=m
CONFIG_CAN_EMS_PCI=m CONFIG_CAN_EMS_PCI=m
# CONFIG_CAN_EMS_PCMCIA is not set
CONFIG_CAN_EMS_USB=m CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m CONFIG_CAN_ESD_USB2=m
# CONFIG_CAN_F81601 is not set # CONFIG_CAN_F81601 is not set
@ -881,7 +880,6 @@ CONFIG_CAN_MCP251X=m
CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCIEFD=m
CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCI=m
# CONFIG_CAN_PEAK_PCMCIA is not set
CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_PLX_PCI=m CONFIG_CAN_PLX_PCI=m
CONFIG_CAN_RAW=m CONFIG_CAN_RAW=m
@ -4833,7 +4831,6 @@ CONFIG_PATA_MARVELL=m
# CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTI is not set
CONFIG_PATA_PCMCIA=m
# CONFIG_PATA_PDC2027X is not set # CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_PLATFORM is not set
@ -4911,19 +4908,7 @@ CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI_TEGRA=y CONFIG_PCI_TEGRA=y
CONFIG_PCI_V3_SEMI=y CONFIG_PCI_V3_SEMI=y
CONFIG_PCI=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 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_PCMCIA_XIRCOM=m
CONFIG_PCNET32=m CONFIG_PCNET32=m
CONFIG_PCS_XPCS=m CONFIG_PCS_XPCS=m
@ -5847,7 +5832,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set # CONFIG_SCSI_IPS is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m
@ -6434,7 +6418,6 @@ CONFIG_SND_OSSEMUL=y
CONFIG_SND_OXFW=m CONFIG_SND_OXFW=m
CONFIG_SND_OXYGEN=m CONFIG_SND_OXYGEN=m
CONFIG_SND_PCI=y CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCM_XRUN_DEBUG=y CONFIG_SND_PCM_XRUN_DEBUG=y
@ -6891,7 +6874,6 @@ CONFIG_SSB_DRIVER_GPIO=y
CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB=m CONFIG_SSB=m
CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST=y CONFIG_SSB_SDIOHOST=y
# CONFIG_SSFDC is not set # CONFIG_SSFDC is not set
CONFIG_STACKLEAK_METRICS=y CONFIG_STACKLEAK_METRICS=y

View File

@ -855,7 +855,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
# CONFIG_CAN_DEBUG_DEVICES is not set # CONFIG_CAN_DEBUG_DEVICES is not set
CONFIG_CAN_DEV=m CONFIG_CAN_DEV=m
CONFIG_CAN_EMS_PCI=m CONFIG_CAN_EMS_PCI=m
# CONFIG_CAN_EMS_PCMCIA is not set
CONFIG_CAN_EMS_USB=m CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m CONFIG_CAN_ESD_USB2=m
# CONFIG_CAN_F81601 is not set # CONFIG_CAN_F81601 is not set
@ -881,7 +880,6 @@ CONFIG_CAN_MCP251X=m
CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCIEFD=m
CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCI=m
# CONFIG_CAN_PEAK_PCMCIA is not set
CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_PLX_PCI=m CONFIG_CAN_PLX_PCI=m
CONFIG_CAN_RAW=m CONFIG_CAN_RAW=m
@ -4814,7 +4812,6 @@ CONFIG_PATA_MARVELL=m
# CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTI is not set
CONFIG_PATA_PCMCIA=m
# CONFIG_PATA_PDC2027X is not set # CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_PLATFORM is not set
@ -4892,19 +4889,7 @@ CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI_TEGRA=y CONFIG_PCI_TEGRA=y
CONFIG_PCI_V3_SEMI=y CONFIG_PCI_V3_SEMI=y
CONFIG_PCI=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 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_PCMCIA_XIRCOM=m
CONFIG_PCNET32=m CONFIG_PCNET32=m
CONFIG_PCS_XPCS=m CONFIG_PCS_XPCS=m
@ -5828,7 +5813,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set # CONFIG_SCSI_IPS is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m
@ -6415,7 +6399,6 @@ CONFIG_SND_OSSEMUL=y
CONFIG_SND_OXFW=m CONFIG_SND_OXFW=m
CONFIG_SND_OXYGEN=m CONFIG_SND_OXYGEN=m
CONFIG_SND_PCI=y CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCXHR=m CONFIG_SND_PCXHR=m
@ -6870,7 +6853,6 @@ CONFIG_SSB_DRIVER_GPIO=y
CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB=m CONFIG_SSB=m
CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST=y CONFIG_SSB_SDIOHOST=y
# CONFIG_SSFDC is not set # CONFIG_SSFDC is not set
CONFIG_STACKLEAK_METRICS=y CONFIG_STACKLEAK_METRICS=y

View File

@ -646,7 +646,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
CONFIG_CAN_DEBUG_DEVICES=y CONFIG_CAN_DEBUG_DEVICES=y
CONFIG_CAN_DEV=m CONFIG_CAN_DEV=m
CONFIG_CAN_EMS_PCI=m CONFIG_CAN_EMS_PCI=m
# CONFIG_CAN_EMS_PCMCIA is not set
CONFIG_CAN_EMS_USB=m CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m CONFIG_CAN_ESD_USB2=m
# CONFIG_CAN_F81601 is not set # CONFIG_CAN_F81601 is not set
@ -673,7 +672,6 @@ CONFIG_CAN_MCBA_USB=m
CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCIEFD=m
CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCI=m
# CONFIG_CAN_PEAK_PCMCIA is not set
CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_PLX_PCI=m CONFIG_CAN_PLX_PCI=m
CONFIG_CAN_RAW=m CONFIG_CAN_RAW=m
@ -4151,7 +4149,6 @@ CONFIG_PATA_NS87415=m
# CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OLDPIIX is not set
CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_OPTI=m CONFIG_PATA_OPTI=m
CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_PLATFORM is not set
@ -4214,20 +4211,8 @@ CONFIG_PCI_PRI=y
CONFIG_PCI_STUB=y CONFIG_PCI_STUB=y
CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m # CONFIG_PCMCIA is not set
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_XIRCOM=m CONFIG_PCMCIA_XIRCOM=m
CONFIG_PCMCIA=y
CONFIG_PCNET32=m CONFIG_PCNET32=m
CONFIG_PCS_XPCS=m CONFIG_PCS_XPCS=m
CONFIG_PD6729=m CONFIG_PD6729=m
@ -4987,7 +4972,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set # CONFIG_SCSI_IPS is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m
@ -5510,7 +5494,6 @@ CONFIG_SND_OSSEMUL=y
CONFIG_SND_OXFW=m CONFIG_SND_OXFW=m
CONFIG_SND_OXYGEN=m CONFIG_SND_OXYGEN=m
CONFIG_SND_PCI=y CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCM_XRUN_DEBUG=y CONFIG_SND_PCM_XRUN_DEBUG=y
@ -5855,7 +5838,6 @@ CONFIG_SSB_DRIVER_GPIO=y
CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB=m CONFIG_SSB=m
CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST=y CONFIG_SSB_SDIOHOST=y
# CONFIG_SSFDC is not set # CONFIG_SSFDC is not set
CONFIG_STACKLEAK_METRICS=y CONFIG_STACKLEAK_METRICS=y

View File

@ -4499,7 +4499,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_ISCI is not set # CONFIG_SCSI_ISCI is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m

View File

@ -645,7 +645,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
# CONFIG_CAN_DEBUG_DEVICES is not set # CONFIG_CAN_DEBUG_DEVICES is not set
CONFIG_CAN_DEV=m CONFIG_CAN_DEV=m
CONFIG_CAN_EMS_PCI=m CONFIG_CAN_EMS_PCI=m
# CONFIG_CAN_EMS_PCMCIA is not set
CONFIG_CAN_EMS_USB=m CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m CONFIG_CAN_ESD_USB2=m
# CONFIG_CAN_F81601 is not set # CONFIG_CAN_F81601 is not set
@ -672,7 +671,6 @@ CONFIG_CAN_MCBA_USB=m
CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCIEFD=m
CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCI=m
# CONFIG_CAN_PEAK_PCMCIA is not set
CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_PLX_PCI=m CONFIG_CAN_PLX_PCI=m
CONFIG_CAN_RAW=m CONFIG_CAN_RAW=m
@ -4130,7 +4128,6 @@ CONFIG_PATA_NS87415=m
# CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OLDPIIX is not set
CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_OPTI=m CONFIG_PATA_OPTI=m
CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_PLATFORM is not set
@ -4193,20 +4190,8 @@ CONFIG_PCI_PRI=y
CONFIG_PCI_STUB=y CONFIG_PCI_STUB=y
CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m # CONFIG_PCMCIA is not set
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_XIRCOM=m CONFIG_PCMCIA_XIRCOM=m
CONFIG_PCMCIA=y
CONFIG_PCNET32=m CONFIG_PCNET32=m
CONFIG_PCS_XPCS=m CONFIG_PCS_XPCS=m
CONFIG_PD6729=m CONFIG_PD6729=m
@ -4966,7 +4951,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set # CONFIG_SCSI_IPS is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m
@ -5489,7 +5473,6 @@ CONFIG_SND_OSSEMUL=y
CONFIG_SND_OXFW=m CONFIG_SND_OXFW=m
CONFIG_SND_OXYGEN=m CONFIG_SND_OXYGEN=m
CONFIG_SND_PCI=y CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCXHR=m CONFIG_SND_PCXHR=m
@ -5832,7 +5815,6 @@ CONFIG_SSB_DRIVER_GPIO=y
CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_SSB=m CONFIG_SSB=m
CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST=y CONFIG_SSB_SDIOHOST=y
# CONFIG_SSFDC is not set # CONFIG_SSFDC is not set
CONFIG_STACKLEAK_METRICS=y CONFIG_STACKLEAK_METRICS=y

View File

@ -4482,7 +4482,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_ISCI is not set # CONFIG_SCSI_ISCI is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m

View File

@ -650,7 +650,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
CONFIG_CAN_DEBUG_DEVICES=y CONFIG_CAN_DEBUG_DEVICES=y
CONFIG_CAN_DEV=m CONFIG_CAN_DEV=m
CONFIG_CAN_EMS_PCI=m CONFIG_CAN_EMS_PCI=m
# CONFIG_CAN_EMS_PCMCIA is not set
CONFIG_CAN_EMS_USB=m CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m CONFIG_CAN_ESD_USB2=m
# CONFIG_CAN_F81601 is not set # CONFIG_CAN_F81601 is not set
@ -676,7 +675,6 @@ CONFIG_CAN_MCBA_USB=m
CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCIEFD=m
CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCI=m
# CONFIG_CAN_PEAK_PCMCIA is not set
CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_PLX_PCI=m CONFIG_CAN_PLX_PCI=m
CONFIG_CAN_RAW=m CONFIG_CAN_RAW=m
@ -4116,7 +4114,6 @@ CONFIG_PATA_NS87415=m
# CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OLDPIIX is not set
CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_OPTI=m CONFIG_PATA_OPTI=m
CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_RADISYS is not set # CONFIG_PATA_RADISYS is not set
@ -4179,19 +4176,7 @@ CONFIG_PCI_PRI=y
CONFIG_PCI_STUB=y CONFIG_PCI_STUB=y
CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=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 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_PCMCIA_XIRCOM=m
CONFIG_PCNET32=m CONFIG_PCNET32=m
CONFIG_PCS_XPCS=m CONFIG_PCS_XPCS=m
@ -4933,7 +4918,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set # CONFIG_SCSI_IPS is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
# CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_LPFC is not set
@ -5453,7 +5437,6 @@ CONFIG_SND_OSSEMUL=y
CONFIG_SND_OXFW=m CONFIG_SND_OXFW=m
CONFIG_SND_OXYGEN=m CONFIG_SND_OXYGEN=m
CONFIG_SND_PCI=y CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCM_XRUN_DEBUG=y CONFIG_SND_PCM_XRUN_DEBUG=y
@ -5794,7 +5777,6 @@ CONFIG_SSB_DRIVER_GPIO=y
CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE=y
# CONFIG_SSB is not set # CONFIG_SSB is not set
CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST=y CONFIG_SSB_SDIOHOST=y
# CONFIG_SSFDC is not set # CONFIG_SSFDC is not set
CONFIG_STACKLEAK_METRICS=y CONFIG_STACKLEAK_METRICS=y

View File

@ -4448,7 +4448,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_ISCI is not set # CONFIG_SCSI_ISCI is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
# CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_LPFC is not set

View File

@ -649,7 +649,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
# CONFIG_CAN_DEBUG_DEVICES is not set # CONFIG_CAN_DEBUG_DEVICES is not set
CONFIG_CAN_DEV=m CONFIG_CAN_DEV=m
CONFIG_CAN_EMS_PCI=m CONFIG_CAN_EMS_PCI=m
# CONFIG_CAN_EMS_PCMCIA is not set
CONFIG_CAN_EMS_USB=m CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m CONFIG_CAN_ESD_USB2=m
# CONFIG_CAN_F81601 is not set # CONFIG_CAN_F81601 is not set
@ -675,7 +674,6 @@ CONFIG_CAN_MCBA_USB=m
CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCIEFD=m
CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCI=m
# CONFIG_CAN_PEAK_PCMCIA is not set
CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_PLX_PCI=m CONFIG_CAN_PLX_PCI=m
CONFIG_CAN_RAW=m CONFIG_CAN_RAW=m
@ -4095,7 +4093,6 @@ CONFIG_PATA_NS87415=m
# CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OLDPIIX is not set
CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_OPTI=m CONFIG_PATA_OPTI=m
CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_RADISYS is not set # CONFIG_PATA_RADISYS is not set
@ -4158,19 +4155,7 @@ CONFIG_PCI_PRI=y
CONFIG_PCI_STUB=y CONFIG_PCI_STUB=y
CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=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 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_PCMCIA_XIRCOM=m
CONFIG_PCNET32=m CONFIG_PCNET32=m
CONFIG_PCS_XPCS=m CONFIG_PCS_XPCS=m
@ -4912,7 +4897,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPS is not set # CONFIG_SCSI_IPS is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
# CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_LPFC is not set
@ -5432,7 +5416,6 @@ CONFIG_SND_OSSEMUL=y
CONFIG_SND_OXFW=m CONFIG_SND_OXFW=m
CONFIG_SND_OXYGEN=m CONFIG_SND_OXYGEN=m
CONFIG_SND_PCI=y CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCXHR=m CONFIG_SND_PCXHR=m
@ -5771,7 +5754,6 @@ CONFIG_SSB_DRIVER_GPIO=y
CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE=y
# CONFIG_SSB is not set # CONFIG_SSB is not set
CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCIHOST=y
CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST=y CONFIG_SSB_SDIOHOST=y
# CONFIG_SSFDC is not set # CONFIG_SSFDC is not set
CONFIG_STACKLEAK_METRICS=y CONFIG_STACKLEAK_METRICS=y

View File

@ -4431,7 +4431,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_ISCI is not set # CONFIG_SCSI_ISCI is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
# CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_LPFC is not set

View File

@ -4458,7 +4458,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_ISCI is not set # CONFIG_SCSI_ISCI is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
# CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_LPFC is not set

View File

@ -4657,7 +4657,6 @@ CONFIG_SCSI_HPSA=m
# CONFIG_SCSI_ISCI is not set # CONFIG_SCSI_ISCI is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m

View File

@ -4637,7 +4637,6 @@ CONFIG_SCSI_HPSA=m
# CONFIG_SCSI_ISCI is not set # CONFIG_SCSI_ISCI is not set
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC_DEBUG_FS is not set # CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_SCSI_LPFC=m CONFIG_SCSI_LPFC=m

View File

@ -56,7 +56,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. # For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0 %global released_kernel 0
%global distro_build 0.rc1.20201229gitdea8dcf2a9fa.109 %global distro_build 0.rc2.114
%if 0%{?fedora} %if 0%{?fedora}
%define secure_boot_arch x86_64 %define secure_boot_arch x86_64
@ -97,13 +97,13 @@ Summary: The Linux kernel
%endif %endif
%define rpmversion 5.11.0 %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 # This is needed to do merge window version magic
%define patchlevel 11 %define patchlevel 11
# allow pkg_release to have configurable %%{?dist} tag # 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} %define pkg_release %{specrelease}
@ -193,7 +193,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels) # Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels). # and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'. # See also 'make debug' and 'make release'.
%define debugbuildsenabled 0 %define debugbuildsenabled 1
# The kernel tarball/base version # The kernel tarball/base version
%define kversion 5.11 %define kversion 5.11
@ -591,7 +591,7 @@ BuildRequires: asciidoc
# exact git commit you can run # exact git commit you can run
# #
# xzcat -qq ${TARBALL} | git get-tar-commit-id # xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-20201229gitdea8dcf2a9fa.tar.xz Source0: linux-5.11-rc2.tar.xz
Source1: Makefile.rhelver Source1: Makefile.rhelver
@ -1235,8 +1235,8 @@ ApplyOptionalPatch()
fi fi
} }
%setup -q -n kernel-20201229gitdea8dcf2a9fa -c %setup -q -n kernel-5.11-rc2 -c
mv linux-20201229gitdea8dcf2a9fa linux-%{KVERREL} mv linux-5.11-rc2 linux-%{KVERREL}
cd linux-%{KVERREL} cd linux-%{KVERREL}
cp -a %{SOURCE1} . cp -a %{SOURCE1} .
@ -2724,6 +2724,9 @@ fi
# #
# #
%changelog %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] * 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) - New configs in drivers/rtc (Fedora Kernel Team)
- redhat/configs: Enable CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL (Josh Poimboeuf) - redhat/configs: Enable CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL (Josh Poimboeuf)

View File

@ -202,7 +202,7 @@ index 000000000000..effb81d04bfd
+ +
+endmenu +endmenu
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 3d328b7ab200..934b3f566c86 100644 index 8b2c3f88ee5e..2cb8050ffd0d 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \

View File

@ -1,3 +1,3 @@
SHA512 (linux-20201229gitdea8dcf2a9fa.tar.xz) = 96772975d85e15b033c0fcc49a78c18e97d16044aa32174e8f89ee4b2e2577b0ef50bf186c7aff82cf59500ce07dc5d8818d0549885d36219870a672e122abaf SHA512 (linux-5.11-rc2.tar.xz) = 293d5607b815e0be40528a691b10ff301df954685b47c11ea7bfb21f7e42541999801164e9a0b9eb4d80ca8337ec38b46e0ce0c960913fc7bf42a36d7f4b0b78
SHA512 (kernel-abi-whitelists-5.11.0-0.rc1.20201229gitdea8dcf2a9fa.109.tar.bz2) = ab66ed60783fd6e11f2ab61d6b527b2ab9692daba55e8334666ab5b6932d62ac5fca57b21c91bb0ff5d17c0b53c3f6761e7e3765508e5f4566b45e7049ba0dfc SHA512 (kernel-abi-whitelists-5.11.0-0.rc2.114.tar.bz2) = 462c48012955712bcd55c58849e3ba04563472393b3923d3081e500043ff95c77f7baeb7844cd09a04a94f478cd200a444f92eaa0864b6366faa0c41036cd5d8
SHA512 (kernel-kabi-dw-5.11.0-0.rc1.20201229gitdea8dcf2a9fa.109.tar.bz2) = 6725c03046a43af4dd931408617107208da49e599d25e986166d54b3d0ce191dee19938c30c6054af5f9f4a0985c35f1a4e6a6493ff9b8b105a110d73b5863b0 SHA512 (kernel-kabi-dw-5.11.0-0.rc2.114.tar.bz2) = 738c307e6acac85b373697b6de5facaf3c67feeeb0ace3d115a30534e30327f13ca74feda9f4b5ac73143f4d1a4fe44b553a99d75c9e1f76af6ff1fe27b2cc66