[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1434554932-4552-21-git-send-email-ebiederm@xmission.com>
Date: Wed, 17 Jun 2015 10:28:30 -0500
From: "Eric W. Biederman" <ebiederm@...ssion.com>
To: David Miller <davem@...emloft.net>
Cc: <netdev@...r.kernel.org>, netfilter-devel@...r.kernel.org,
Stephen Hemminger <stephen@...workplumber.org>,
Juanjo Ciarlante <jjciarla@...z.uncu.edu.ar>,
Wensong Zhang <wensong@...ux-vs.org>,
Simon Horman <horms@...ge.net.au>,
Julian Anastasov <ja@....bg>,
Pablo Neira Ayuso <pablo@...filter.org>,
Patrick McHardy <kaber@...sh.net>,
Jozsef Kadlecsik <kadlec@...ckhole.kfki.hu>,
Jamal Hadi Salim <jhs@...atatu.com>,
Steffen Klassert <steffen.klassert@...unet.com>,
Herbert Xu <herbert@...dor.apana.org.au>
Subject: [PATCH net-next 21/43] netfilter: Add a network namespace Kconfig conflict
From: Eric W Biederman <ebiederm@...ssion.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@...ssion.com>
---
init/Kconfig | 1 +
1 file changed, 1 insertion(+)
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
--
2.2.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists