Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net...

Resolve conflicts with conntrack template fixes.

Conflicts:
	net/netfilter/nf_conntrack_core.c
	net/netfilter/nf_synproxy_core.c
	net/netfilter/xt_CT.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc net/netfilter/nf_synproxy_core.c
index 58b2e84,14f8b43..8fbbdb0
--- 1/net/netfilter/nf_synproxy_core.c
--- 2/net/netfilter/nf_synproxy_core.c
+++ b/net/netfilter/nf_synproxy_core.c
@@@ -354,11 -352,9 +354,9 @@@ static int __net_init synproxy_net_init
        struct nf_conn *ct;
        int err = -ENOMEM;
  
 -      ct = nf_ct_tmpl_alloc(net, 0, GFP_KERNEL);
 +      ct = nf_ct_tmpl_alloc(net, &nf_ct_zone_dflt, GFP_KERNEL);
-       if (IS_ERR(ct)) {
-               err = PTR_ERR(ct);
+       if (!ct)
                goto err1;
-       }
  
        if (!nfct_seqadj_ext_add(ct))
                goto err2;

diff --cc net/netfilter/xt_CT.c
index 3465098,43ddeee..8e52489
--- 1/net/netfilter/xt_CT.c
--- 2/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@@ -217,16 -201,11 +217,17 @@@ static int xt_ct_tg_check(const struct 
        if (ret < 0)
                goto err1;
  
 -      ct = nf_ct_tmpl_alloc(par->net, info->zone, GFP_KERNEL);
 +      memset(&zone, 0, sizeof(zone));
 +      zone.id = info->zone;
 +      zone.dir = xt_ct_flags_to_dir(info);
 +      if (info->flags & XT_CT_ZONE_MARK)
 +              zone.flags |= NF_CT_FLAG_MARK;
 +
 +      ct = nf_ct_tmpl_alloc(par->net, &zone, GFP_KERNEL);
-       ret = PTR_ERR(ct);
-       if (IS_ERR(ct))
+       if (!ct) {
+               ret = -ENOMEM;
                goto err2;
+       }
  
        ret = 0;
        if ((info->ct_events || info->exp_events) &&