diff --git a/[refs] b/[refs] index 34c0066f31c4..eb23e5faa3a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1548bf316f18090576f611c7318447c512ddbdd2 +refs/heads/master: 9bd38c2cdaba1f3ab2e6f90ac1b3d72481477092 diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 3ae8ffe738eb..c91ce6bcbe68 100644 --- a/trunk/init/Kconfig +++ b/trunk/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.