diff options
author | Daniel Lezcano <daniel.lezcano@free.fr> | 2010-10-27 18:34:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 21:03:16 -0400 |
commit | 9bd38c2cdaba1f3ab2e6f90ac1b3d72481477092 (patch) | |
tree | b9f7db1b1bacd34d9c5e5974187bf477cf8dbc9e /init/Kconfig | |
parent | 1548bf316f18090576f611c7318447c512ddbdd2 (diff) |
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/Kconfig')
-rw-r--r-- | init/Kconfig | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/init/Kconfig b/init/Kconfig index 3ae8ffe738eb..c91ce6bcbe68 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -766,21 +766,18 @@ config USER_NS | |||
766 | If unsure, say N. | 766 | If unsure, say N. |
767 | 767 | ||
768 | config PID_NS | 768 | config PID_NS |
769 | bool "PID Namespaces (EXPERIMENTAL)" | 769 | bool "PID Namespaces" |
770 | default n | 770 | default n |
771 | depends on NAMESPACES && EXPERIMENTAL | 771 | depends on NAMESPACES |
772 | help | 772 | help |
773 | Support process id namespaces. This allows having multiple | 773 | Support process id namespaces. This allows having multiple |
774 | processes with the same pid as long as they are in different | 774 | processes with the same pid as long as they are in different |
775 | pid namespaces. This is a building block of containers. | 775 | pid namespaces. This is a building block of containers. |
776 | 776 | ||
777 | Unless you want to work with an experimental feature | ||
778 | say N here. | ||
779 | |||
780 | config NET_NS | 777 | config NET_NS |
781 | bool "Network namespace" | 778 | bool "Network namespace" |
782 | default n | 779 | default n |
783 | depends on NAMESPACES && EXPERIMENTAL && NET | 780 | depends on NAMESPACES && NET |
784 | help | 781 | help |
785 | Allow user space to create what appear to be multiple instances | 782 | Allow user space to create what appear to be multiple instances |
786 | of the network stack. | 783 | of the network stack. |