From 903091e6af33e8f336fd78e9d9ab178d0761856e Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
Date: Tue, 29 Mar 2011 19:26:56 +0200
Subject: [PATCH] UBUNTU: (config) Disable CONFIG_NET_NS

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

While network namespaces are used for containers, the implementation was
still experimental in Lucid. Even worse the cleanup of network
namespaces is very slow. This can cause severe memory issues when an
application uses them a lot (for example when cloning subprocesses).

The problem can only be avoided by backporting several upstream patches
(and without even more changes that will slow down the creation of new
net namespaces). This cannot really be justified as a stable update.

So turn the option off in Lucid. Users of containers should be pointed
to the LTS-backport kernel.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 debian.master/config/config.common.ports  |    2 +-
 debian.master/config/config.common.ubuntu |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index 9173ecd..82c9c88 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -2092,7 +2092,7 @@ CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_NET_IPIP=m
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_NS=y
+# CONFIG_NET_NS is not set
 CONFIG_NET_PCI=y
 CONFIG_NET_PCMCIA=y
 CONFIG_NET_POCKET=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 03d8049..8a93892 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2532,7 +2532,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_ISA=y
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_NS=y
+# CONFIG_NET_NS is not set
 CONFIG_NET_PCI=y
 CONFIG_NET_PCMCIA=y
 CONFIG_NET_PKTGEN=m
-- 
1.7.0.4

