Now that the nf_register_hook conversion is complete netfilter should work just fine with network namespaces remove the temporary Kconfig conflict. Signed-off-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> --- init/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/init/Kconfig b/init/Kconfig index 166cfbfdc2df..dc24dec60232 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1207,7 +1207,6 @@ 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 netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
