diff --git a/[refs] b/[refs] index 745cbf01cc92..e8119301853f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74bd59bb39eb08b4379e2590c5f160748d83f812 +refs/heads/master: cbdc73873229754ab3e673ea8c82eaf9ae3c646f diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig index b6a5d454f2ff..6627c6ae5db6 100644 --- a/trunk/net/Kconfig +++ b/trunk/net/Kconfig @@ -30,7 +30,7 @@ menu "Networking options" config NET_NS bool "Network namespace support" default n - depends on EXPERIMENTAL && !SYSFS + depends on EXPERIMENTAL && !SYSFS && NAMESPACES help Allow user space to create what appear to be multiple instances of the network stack.