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

Stefan Bader stefan.bader at canonical.com
Tue Sep 19 10:15:47 UTC 2017


On 19.09.2017 12:04, Juerg Haefliger wrote:
> Can/should we roll this into the current SRU cycle? I can send an
> updated patch with hints in the config file.
> 
> ...Juerg

As I acked it later I have no issues with it going in as is. Just needs someone
else to say yay and apply it ;)

-Stefan
> 
> 
> On 09/12/2017 04:18 PM, Stefan Bader wrote:
>> On 12.09.2017 16:09, Juerg Haefliger wrote:
>>>
>>>
>>> On 09/12/2017 04:06 PM, Stefan Bader wrote:
>>>> On 12.09.2017 15:46, Juerg Haefliger wrote:
>>>>> BugLink: http://bugs.launchpad.net/bugs/1670634
>>>>>
>>>>> Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
>>>>> ---
>>>>
>>>> The annotations file can have hints about the reasons for certain changes. Not
>>>> sure it is that much useful after the next release(s) are out but maybe still
>>>> would be nice to add something like below.
>>>
>>> I wasn't sure if this is required. Seems redundant since the ticket# is
>>> already in the commit message.
>>
>> Yes, I think its main use is config review which Seth or Andy do (or did). Lets
>> put this on todo and I do a bit more thinking...
>>
>> -Stefan
>>
>>>
>>> ...Juerg
>>>
>>>
>>>>>  debian.master/config/amd64/config.common.amd64     | 2 --
>>>>>  debian.master/config/annotations                   | 4 ++--
>>>>>  debian.master/config/arm64/config.common.arm64     | 2 --
>>>>>  debian.master/config/armhf/config.common.armhf     | 2 --
>>>>>  debian.master/config/config.common.ubuntu          | 2 ++
>>>>>  debian.master/config/i386/config.common.i386       | 2 --
>>>>>  debian.master/config/powerpc/config.common.powerpc | 2 --
>>>>>  debian.master/config/ppc64el/config.common.ppc64el | 2 --
>>>>>  debian.master/config/s390x/config.common.s390x     | 2 --
>>>>>  9 files changed, 4 insertions(+), 16 deletions(-)
>>>>>
>>>>> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
>>>>> index e309fcbf19c3..443d7650d9c3 100644
>>>>> --- a/debian.master/config/amd64/config.common.amd64
>>>>> +++ b/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
>>>>> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
>>>>> index 2b1bff6543d3..a7feba536ead 100644
>>>>> --- a/debian.master/config/annotations
>>>>> +++ b/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'}>
>>>>
>>>> CONFIG_DM_MQ_DEFAULT                     note<LP#1670634 requested s390x:n for
>>>> Xenial>
>>>>
>>>>> @@ -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'}>
>>>>
>>>> CONFIG_SCSI_MQ_DEFAULT                   note<LP#1670634 requested s390x:n for
>>>> Xenial>
>>>>
>>>>> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
>>>>> index ed55849221c8..4385e88f57ea 100644
>>>>> --- a/debian.master/config/arm64/config.common.arm64
>>>>> +++ b/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
>>>>> diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
>>>>> index 054ec4d4d4dd..246054c8102d 100644
>>>>> --- a/debian.master/config/armhf/config.common.armhf
>>>>> +++ b/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
>>>>> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
>>>>> index 73dc3a8ce3de..8499c74274ed 100644
>>>>> --- a/debian.master/config/config.common.ubuntu
>>>>> +++ b/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
>>>>> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
>>>>> index 5cad5b702ff5..f2c2512e7221 100644
>>>>> --- a/debian.master/config/i386/config.common.i386
>>>>> +++ b/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
>>>>> diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
>>>>> index a14ff52f7f9d..582c02623d7b 100644
>>>>> --- a/debian.master/config/powerpc/config.common.powerpc
>>>>> +++ b/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
>>>>> diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
>>>>> index 6974b045cb0c..66ae2e18f5b8 100644
>>>>> --- a/debian.master/config/ppc64el/config.common.ppc64el
>>>>> +++ b/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
>>>>> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
>>>>> index 81f22f85efdd..5deba19a2f2a 100644
>>>>> --- a/debian.master/config/s390x/config.common.s390x
>>>>> +++ b/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
>>>>>
>>>>
>>>>
>>>
>>
>>
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20170919/8e728ee6/attachment.sig>


More information about the kernel-team mailing list