namespaces: remove pid_ns and net_ns experimental status

[sfrench/cifs-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 3ae8ffe738eb4878d9d1fe383e36279026d396e0..c91ce6bcbe683b68315343065289276d6337a7c0 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -766,21 +766,18 @@ config USER_NS
          If unsure, say N.
 
 config PID_NS
          If unsure, say N.
 
 config PID_NS

-       bool "PID Namespaces (EXPERIMENTAL)"
+       bool "PID Namespaces"

        default n
        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.
 
        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
 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.
        help
          Allow user space to create what appear to be multiple instances
          of the network stack.