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

diff --cc include/linux/netfilter.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/net/netfilter/nf_conntrack.h
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
Simple merge

diff --cc net/ipv6/netfilter/nf_conntrack_reasm.c
Simple merge

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

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_xmit.c
index fb2a445,5325a3f..1f2a4e3
--- 1/net/netfilter/ipvs/ip_vs_xmit.c
--- 2/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@@ -178,16 -170,12 +170,11 @@@ __ip_vs_reroute_locally(struct sk_buff 
                refdst_drop(orefdst);
        } else {
                struct flowi fl = {
-                       .oif = 0,
-                       .nl_u = {
-                               .ip4_u = {
-                                       .daddr = iph->daddr,
-                                       .saddr = iph->saddr,
-                                       .tos = RT_TOS(iph->tos),
-                               }
-                       },
+                       .fl4_dst = iph->daddr,
+                       .fl4_src = iph->saddr,
+                       .fl4_tos = RT_TOS(iph->tos),
                        .mark = skb->mark,
                };
 -              struct rtable *rt;
  
                if (ip_route_output_key(net, &rt, &fl))
                        return 0;

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

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

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

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