From: Eric W. Biederman <ebiederm@xmission.com>
Date: Thu, 16 Aug 2012 00:46:22 +0000 (-0700)
Subject: userns: Enable building of pf_key sockets when user namespace support is enabled.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bc45dae323112f2365d7ca307571781163d1bc04;p=linux-beck.git

userns: Enable building of pf_key sockets when user namespace support is enabled.

Enable building of pf_key sockets and user namespace support at the
same time.  This combination builds successfully so there is no reason
to forbid it.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---

diff --git a/init/Kconfig b/init/Kconfig
index b445d6f49bcf..448b701b1722 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -944,7 +944,6 @@ config UIDGID_CONVERTED
 	# Networking
 	depends on NET_9P = n
 	depends on AF_RXRPC = n
-	depends on NET_KEY = n
 	depends on DNS_RESOLVER = n
 
 	# Filesystems