UBUNTU: [Config] CONFIG_IPDDP=n

BugLink: http://bugs.launchpad.net/bugs/1559772
This module isn't being actively maintained, and when it is
enabled it prevents a newer userspace implementation from
working.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 0b258c61b4851ad66d9766b1e11e0c775e164135..581620d8eea2f27fdd41c5f95b3bf49a6735622f 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -9211,8 +9211,9 @@ CONFIG_LTPC                                     policy<{'i386': 'm'}>
 CONFIG_COPS                                     policy<{'i386': 'm'}>
 CONFIG_COPS_DAYNA                               policy<{'i386': 'y'}>
 CONFIG_COPS_TANGENT                             policy<{'i386': 'y'}>
-CONFIG_IPDDP                                    policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
-CONFIG_IPDDP_ENCAP                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
+CONFIG_IPDDP                                    policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
+#
+CONFIG_IPDDP                                    mark<ENFORCED> note<LP:1559772>
 
 # Menu: Networking support >> Networking options >> Asynchronous Transfer Mode (ATM)
 CONFIG_ATM                                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'n'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 55a8c247d87ef19404148a36d31724b3081d818f..f8d4ff55c9911a91517695454809f0cac7cf803c 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3934,8 +3934,7 @@ CONFIG_IP6_NF_TARGET_NPT=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_SYNPROXY=m
 CONFIG_IPC_NS=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
+# CONFIG_IPDDP is not set
 # CONFIG_IPIC is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
 # CONFIG_IPMI_PANIC_EVENT is not set