From: dann frazier <dann.frazier@canonical.com>
Date: Mon, 13 Mar 2017 20:33:40 +0000 (-0600)
Subject: UBUNTU: [Config] CONFIG_LIBIO=y on arm64 only
X-Git-Tag: Ubuntu-4.10.0-22.24~235
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4730568e8e5f7b8f88cbdb75376884ae8ab4f389;p=mirror_ubuntu-zesty-kernel.git

UBUNTU: [Config] CONFIG_LIBIO=y on arm64 only

BugLink: http://bugs.launchpad.net/bugs/1677319

Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 475f783b799e..62d55fbcd4b5 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -169,6 +169,7 @@ CONFIG_KERNEL_GZIP=y
 CONFIG_KVM=m
 CONFIG_LAPB=m
 CONFIG_LDM_PARTITION=y
+# CONFIG_LIBIO is not set
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=18
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 67ed5e8dbca1..a2dcd7f00a67 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -187,6 +187,7 @@ CONFIG_KVM=y
 CONFIG_LAPB=m
 # CONFIG_LATENCYTOP is not set
 CONFIG_LDM_PARTITION=y
+CONFIG_LIBIO=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=14
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index b44bb5a0f443..b8991d65278f 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -171,6 +171,7 @@ CONFIG_KVM=y
 CONFIG_LAPB=m
 # CONFIG_LATENCYTOP is not set
 CONFIG_LDM_PARTITION=y
+# CONFIG_LIBIO is not set
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=17
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 471274ced9b9..8feb03a7fe83 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -166,6 +166,7 @@ CONFIG_KVM=m
 CONFIG_LAPB=m
 # CONFIG_LATENCYTOP is not set
 CONFIG_LDM_PARTITION=y
+# CONFIG_LIBIO is not set
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=17
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 29f0c76afefb..b51f9cb056b4 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -169,6 +169,7 @@ CONFIG_KVM=y
 CONFIG_LAPB=m
 # CONFIG_LATENCYTOP is not set
 CONFIG_LDM_PARTITION=y
+# CONFIG_LIBIO is not set
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=17
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 79598aa703b1..9d675175bbad 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -149,6 +149,7 @@ CONFIG_KVM=y
 # CONFIG_LAPB is not set
 # CONFIG_LATENCYTOP is not set
 # CONFIG_LDM_PARTITION is not set
+# CONFIG_LIBIO is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LLC2 is not set
 CONFIG_LOG_BUF_SHIFT=17