summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-05-23 17:33:47 -0600
committerEric W. Biederman <ebiederm@xmission.com>2012-08-14 21:47:45 -0700
commitfc5795c8a94c2d0b221dffae9ebb22686b3dafd8 (patch)
treed21190545d42e2d783194ebdd34d451c3308099f /init
parent976d020150456fccbd34103fd117fab910eed09c (diff)
downloadop-kernel-dev-fc5795c8a94c2d0b221dffae9ebb22686b3dafd8.zip
op-kernel-dev-fc5795c8a94c2d0b221dffae9ebb22686b3dafd8.tar.gz
userns: Allow USER_NS and NET simultaneously in Kconfig
Now that the networking core is user namespace safe allow networking and user namespaces to be built at the same time. Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 364b38d..80fae19 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -942,7 +942,7 @@ config UIDGID_CONVERTED
depends on PROC_EVENTS = n
# Networking
- depends on NET = n
+ depends on PACKET = n
depends on NET_9P = n
depends on IPX = n
depends on PHONET = n
OpenPOWER on IntegriCloud