summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@free.fr>2010-10-27 15:34:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 18:03:16 -0700
commit9bd38c2cdaba1f3ab2e6f90ac1b3d72481477092 (patch)
treeb9f7db1b1bacd34d9c5e5974187bf477cf8dbc9e /init
parent1548bf316f18090576f611c7318447c512ddbdd2 (diff)
downloadlinux-3.10-9bd38c2cdaba1f3ab2e6f90ac1b3d72481477092.tar.gz
linux-3.10-9bd38c2cdaba1f3ab2e6f90ac1b3d72481477092.tar.bz2
linux-3.10-9bd38c2cdaba1f3ab2e6f90ac1b3d72481477092.zip
namespaces: remove pid_ns and net_ns experimental status
The pid namespace is in the kernel since 2.6.27 and the net_ns since 2.6.29. They are enabled in the distro by default and used by userspace component. They are mature enough to remove the 'experimental' label. Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig9
1 files changed, 3 insertions, 6 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 3ae8ffe738e..c91ce6bcbe6 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -766,21 +766,18 @@ config USER_NS
If unsure, say N.
config PID_NS
- bool "PID Namespaces (EXPERIMENTAL)"
+ bool "PID Namespaces"
default n
- depends on NAMESPACES && EXPERIMENTAL
+ depends on NAMESPACES
help
Support process id namespaces. This allows having multiple
processes with the same pid as long as they are in different
pid namespaces. This is a building block of containers.
- Unless you want to work with an experimental feature
- say N here.
-
config NET_NS
bool "Network namespace"
default n
- depends on NAMESPACES && EXPERIMENTAL && NET
+ depends on NAMESPACES && NET
help
Allow user space to create what appear to be multiple instances
of the network stack.