On Tue, May 08, 2012 at 12:49:26PM -0400, David Miller wrote: > From: pablo@xxxxxxxxxxxxx > Date: Tue, 8 May 2012 09:49:29 +0200 > > > Second version including requested updates. > > There were lots of conflicts, due to my merge of net into net-next. > > Those were easy enough, but the result doesn't build. > > net/netfilter/nf_conntrack_helper.c: In function ‘nf_conntrack_helper_init_sysctl’: > net/netfilter/nf_conntrack_helper.c:65:2: error: implicit declaration of function ‘register_net_sysctl_table’ [-Werror=implicit-function-declaration] > net/netfilter/nf_conntrack_helper.c:66:4: error: ‘nf_net_netfilter_sysctl_path’ undeclared (first use in this function) > net/netfilter/nf_conntrack_helper.c:66:4: note: each undeclared identifier is reported only once for each function it appears in Strange, this compiles here. Probably you have to add the following include to net/netfilter/nf_conntrack_helper.c: #include <net/net_namespace.h> I can rebase all my patches on top of fresh tree, fix all conflicts myself and send you another patchset that will apply to your current tree. Please, let me know how to proceed. -- 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
