UBUNTU: [Config] CONFIG_NET_9P=m for s390x

BugLink: http://bugs.launchpad.net/bugs/1557994Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

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

@@ -210,7 +210,6 @@ CONFIG_MTD_NAND_IDS=m
 CONFIG_NCP_FS=m
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NET_9P=m
 CONFIG_NET_CADENCE=y
 CONFIG_NET_PACKET_ENGINE=y
 CONFIG_NET_VENDOR_3COM=y

debian.master/config/annotations

@@ -7546,10 +7546,10 @@ CONFIG_NFSD_V4_SECURITY_LABEL                   policy<{'amd64': 'y', 'arm64': '
 CONFIG_NFSD_FAULT_INJECTION                     policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 
 # Menu: File systems >> Network File Systems >> Plan 9 Resource Sharing Support (9P2000)
-CONFIG_9P_FS                                    policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
-CONFIG_9P_FSCACHE                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
-CONFIG_9P_FS_POSIX_ACL                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
-CONFIG_9P_FS_SECURITY                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
+CONFIG_9P_FS                                    policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_9P_FSCACHE                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_9P_FS_POSIX_ACL                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_9P_FS_SECURITY                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 
 # Menu: File systems >> OCFS2 file system support
 CONFIG_OCFS2_FS                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
@@ -9019,10 +9019,11 @@ CONFIG_TIPC_MEDIA_IB                            policy<{'amd64': 'y', 'arm64': '
 CONFIG_TIPC_MEDIA_UDP                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 
 # Menu: Networking support >> Plan 9 Resource Sharing Support (9P2000)
-CONFIG_NET_9P                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'n'}>
-CONFIG_NET_9P_VIRTIO                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
-CONFIG_NET_9P_RDMA                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
-CONFIG_NET_9P_DEBUG                             policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
+CONFIG_NET_9P                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_NET_9P_VIRTIO                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_NET_9P_RDMA                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_NET_9P_DEBUG                             policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_NET_9P                                   note<LP#1557994>
 
 # Menu: Networking support >> RF switch subsystem support
 CONFIG_RFKILL                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'n'}>

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

@@ -212,7 +212,6 @@ CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_OF_PARTS=m
 CONFIG_NCP_FS=m
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NET_9P=m
 CONFIG_NET_CADENCE=y
 CONFIG_NET_PACKET_ENGINE=y
 CONFIG_NET_VENDOR_3COM=y

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

@@ -204,7 +204,6 @@ CONFIG_MTD_NAND_OMAP_BCH_BUILD=y
 CONFIG_MTD_OF_PARTS=y
 CONFIG_NCP_FS=m
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NET_9P=m
 CONFIG_NET_CADENCE=y
 CONFIG_NET_PACKET_ENGINE=y
 CONFIG_NET_VENDOR_3COM=y

debian.master/config/config.common.ubuntu

@@ -5014,6 +5014,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NETXEN_NIC=m
+CONFIG_NET_9P=m
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_NET_9P_RDMA=m
 CONFIG_NET_9P_VIRTIO=m

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

@@ -208,7 +208,6 @@ CONFIG_MTD_NAND_IDS=m
 CONFIG_NCP_FS=m
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NET_9P=m
 CONFIG_NET_CADENCE=y
 CONFIG_NET_PACKET_ENGINE=y
 CONFIG_NET_VENDOR_3COM=y

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

@@ -201,7 +201,6 @@ CONFIG_MTD_NAND_IDS=m
 # CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
 CONFIG_MTD_OF_PARTS=m
 CONFIG_NCP_FS=m
-CONFIG_NET_9P=m
 CONFIG_NET_CADENCE=y
 CONFIG_NET_PACKET_ENGINE=y
 CONFIG_NET_VENDOR_3COM=y

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

@@ -225,7 +225,6 @@ CONFIG_MTD_OF_PARTS=m
 CONFIG_NCP_FS=m
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NET_9P=m
 CONFIG_NET_CADENCE=y
 CONFIG_NET_PACKET_ENGINE=y
 CONFIG_NET_VENDOR_3COM=y

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

@@ -171,7 +171,6 @@ CONFIG_MD_MULTIPATH=y
 # CONFIG_MTD is not set
 # CONFIG_NCP_FS is not set
 CONFIG_NEED_DMA_MAP_STATE=y
-# CONFIG_NET_9P is not set
 # CONFIG_NET_CADENCE is not set
 # CONFIG_NET_PACKET_ENGINE is not set
 # CONFIG_NET_VENDOR_3COM is not set