diff mbox

[net-next,21/43] netfilter: Add a network namespace Kconfig conflict

Message ID 1434554932-4552-21-git-send-email-ebiederm@xmission.com
State Changes Requested
Delegated to: Pablo Neira
Headers show

Commit Message

Eric W. Biederman June 17, 2015, 3:28 p.m. UTC 
From: Eric W Biederman <ebiederm@xmission.com>

Don't allow network namespaces and netfilter to both be
enabled.  This allows the netfilter code to be bisected
through while per network namespace netfilter hooks are
being implemented.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
 init/Kconfig | 1 +
 1 file changed, 1 insertion(+)
diff mbox

Patch

diff --git a/init/Kconfig b/init/Kconfig
index dc24dec60232..166cfbfdc2df 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1207,6 +1207,7 @@  config PID_NS
 config NET_NS
 	bool "Network namespace"
 	depends on NET
+	depends on !NETFILTER
 	default y
 	help
 	  Allow user space to create what appear to be multiple instances