From: Eric W. Biederman <ebiederm@xmission.com>
Date: Wed, 23 May 2012 23:33:47 +0000 (-0600)
Subject: userns: Allow USER_NS and NET simultaneously in Kconfig
X-Git-Tag: v3.7-rc1~147^2~101
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc5795c8a94c2d0b221dffae9ebb22686b3dafd8;p=profile%2Fivi%2Fkernel-x86-ivi.git

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>
---

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