From: Gustavo Walbon <gwalbon@linux.vnet.ibm.com>
Date: Tue, 18 Jul 2017 18:04:04 +0000 (-0300)
Subject: UBUNTU: [Config] CONFIG_IBMVETH=m
X-Git-Tag: Ubuntu-4.10.0-33.37~70
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c960d8c991047f47f4cda5a465a29a06822902d0;p=mirror_ubuntu-zesty-kernel.git

UBUNTU: [Config] CONFIG_IBMVETH=m

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

As Novalink has required a change in config file to change the
IBMVETH to module state instead of built in.

Signed-off-by: Gustavo Walbon <gwalbon@linux.vnet.ibm.com>
Signed-off-by: Breno Leitao <leitao@debian.org>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
---

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f2d3a99e849d..aac40b74a839 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -4686,7 +4686,7 @@ CONFIG_HNS_ENET                                 policy<{'arm64': 'm', 'armhf': '
 
 # Menu: Device Drivers >> Network device support >> Ethernet driver support >> IBM devices
 CONFIG_NET_VENDOR_IBM                           policy<{'ppc64el': 'y'}>
-CONFIG_IBMVETH                                  policy<{'ppc64el': 'y'}>
+CONFIG_IBMVETH                                  policy<{'ppc64el': 'm'}>
 CONFIG_IBMVNIC                                  policy<{'ppc64el': 'm'}>
 #
 CONFIG_IBMVNIC                            	mark<ENFORCED> note<LP:#1628187>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 57780e030658..ca6e8be79531 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3580,7 +3580,7 @@ CONFIG_IA32_EMULATION=y
 CONFIG_IAQCORE=m
 CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
-CONFIG_IBMVETH=y
+CONFIG_IBMVETH=m
 CONFIG_IBMVIO=y
 CONFIG_IBMVNIC=m
 CONFIG_IBM_ASM=m