UBUNTU: [Config] s390x -- disable CONFIG_{DM, SCSI}_MQ_DEFAULT

BugLink: http://bugs.launchpad.net/bugs/1670634Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

debian.master/config/amd64/config.common.amd64

@@ -74,7 +74,6 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_VIRTUAL_CHANNELS=m
 # CONFIG_DM_DEBUG is not set
-# CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DNET=m
 CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
@@ -358,7 +357,6 @@ CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_PM8001=m

debian.master/config/annotations

@@ -3875,7 +3875,7 @@ CONFIG_DM_DEBUG_BLOCK_STACK_TRACING             policy<{'amd64': 'n', 'arm64': '
 
 # Menu: Device Drivers >> Multiple devices driver support (RAID and LVM) >> Device mapper support
 CONFIG_BLK_DEV_DM                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_DM_MQ_DEFAULT                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'y'}>
+CONFIG_DM_MQ_DEFAULT                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_DM_DEBUG                                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'y'}>
 CONFIG_DM_CRYPT                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_DM_SNAPSHOT                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
@@ -5201,7 +5201,7 @@ CONFIG_RAID_ATTRS                               policy<{'amd64': 'm', 'arm64': '
 
 # Menu: Device Drivers >> SCSI device support >> SCSI device support
 CONFIG_SCSI                                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_SCSI_MQ_DEFAULT                          policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'y'}>
+CONFIG_SCSI_MQ_DEFAULT                          policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_SCSI_PROC_FS                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_BLK_DEV_SD                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_CHR_DEV_ST                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>

debian.master/config/arm64/config.common.arm64

@@ -75,7 +75,6 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 # CONFIG_DM_DEBUG is not set
-# CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DNET=m
 CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
@@ -361,7 +360,6 @@ CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_PM8001=m

debian.master/config/armhf/config.common.armhf

@@ -74,7 +74,6 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 # CONFIG_DM_DEBUG is not set
-# CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DNET=m
 CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
@@ -350,7 +349,6 @@ CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_PM8001=m

debian.master/config/config.common.ubuntu

@@ -1913,6 +1913,7 @@ CONFIG_DM_FLAKEY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=m
+# CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
@@ -6661,6 +6662,7 @@ CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 CONFIG_SCSI_MPT3SAS=m
 CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+# CONFIG_SCSI_MQ_DEFAULT is not set
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 # CONFIG_SCSI_MVSAS_TASKLET is not set
 CONFIG_SCSI_NCR53C406A=m

debian.master/config/i386/config.common.i386

@@ -72,7 +72,6 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_VIRTUAL_CHANNELS=m
 # CONFIG_DM_DEBUG is not set
-# CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DNET=m
 CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
@@ -355,7 +354,6 @@ CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_PM8001=m

debian.master/config/powerpc/config.common.powerpc

@@ -70,7 +70,6 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_VIRTUAL_CHANNELS=m
 # CONFIG_DM_DEBUG is not set
-# CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DNET=m
 CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
@@ -350,7 +349,6 @@ CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_PM8001=m

debian.master/config/ppc64el/config.common.ppc64el

@@ -77,7 +77,6 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_VIRTUAL_CHANNELS=m
 # CONFIG_DM_DEBUG is not set
-# CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DNET=m
 CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
@@ -398,7 +397,6 @@ CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_PM8001=m

debian.master/config/s390x/config.common.s390x

@@ -65,7 +65,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_DMADEVICES is not set
 # CONFIG_DMA_SHARED_BUFFER is not set
 CONFIG_DM_DEBUG=y
-CONFIG_DM_MQ_DEFAULT=y
 # CONFIG_DNET is not set
 # CONFIG_DRM is not set
 # CONFIG_DUMMY_IRQ is not set
@@ -301,7 +300,6 @@ CONFIG_SCHED_SMT=y
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_LPFC is not set
-CONFIG_SCSI_MQ_DEFAULT=y
 # CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_MVUMI is not set
 # CONFIG_SCSI_PM8001 is not set