Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/core/rtnetlink.c
	net/core/skbuff.c

Both conflicts were very simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc arch/sparc/net/bpf_jit_comp.c
index c88cf14,49cee4a..892a102
--- 1/arch/sparc/net/bpf_jit_comp.c
--- 2/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@@ -589,23 -597,23 +589,23 @@@ void bpf_jit_compile(struct sk_filter *
                                emit_alu_K(SRL, 5);
                                break;
  #endif
 -                      case BPF_S_ANC_IFINDEX:
 +                      case BPF_ANC | SKF_AD_IFINDEX:
                                emit_skb_loadptr(dev, r_A);
                                emit_cmpi(r_A, 0);
-                               emit_branch(BNE_PTR, cleanup_addr + 4);
+                               emit_branch(BE_PTR, cleanup_addr + 4);
                                emit_nop();
                                emit_load32(r_A, struct net_device, ifindex, r_A);
                                break;
 -                      case BPF_S_ANC_MARK:
 +                      case BPF_ANC | SKF_AD_MARK:
                                emit_skb_load32(mark, r_A);
                                break;
 -                      case BPF_S_ANC_QUEUE:
 +                      case BPF_ANC | SKF_AD_QUEUE:
                                emit_skb_load16(queue_mapping, r_A);
                                break;
 -                      case BPF_S_ANC_HATYPE:
 +                      case BPF_ANC | SKF_AD_HATYPE:
                                emit_skb_loadptr(dev, r_A);
                                emit_cmpi(r_A, 0);
-                               emit_branch(BNE_PTR, cleanup_addr + 4);
+                               emit_branch(BE_PTR, cleanup_addr + 4);
                                emit_nop();
                                emit_load16(r_A, struct net_device, type, r_A);
                                break;

diff --cc drivers/net/macvlan.c
Simple merge

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

diff --cc net/core/rtnetlink.c
index 741b22c,d57d7bc..233b5ae
--- 1/net/core/rtnetlink.c
--- 2/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@@ -1214,8 -1208,8 +1214,10 @@@ static const struct nla_policy ifla_vf_
                                    .len = sizeof(struct ifla_vf_tx_rate) },
        [IFLA_VF_SPOOFCHK]      = { .type = NLA_BINARY,
                                    .len = sizeof(struct ifla_vf_spoofchk) },
 +      [IFLA_VF_RATE]          = { .type = NLA_BINARY,
 +                                  .len = sizeof(struct ifla_vf_rate) },
+       [IFLA_VF_LINK_STATE]    = { .type = NLA_BINARY,
+                                   .len = sizeof(struct ifla_vf_link_state) },
  };
  
  static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = {

diff --cc net/core/skbuff.c
index b9e85e6,9433047..bf92824
--- 1/net/core/skbuff.c
--- 2/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@@ -2889,10 -2886,8 +2890,9 @@@ struct sk_buff *skb_segment(struct sk_b
        if (unlikely(!proto))
                return ERR_PTR(-EINVAL);
  
 -      csum = !!can_checksum_protocol(features, proto);
 +      csum = !head_skb->encap_hdr_csum &&
 +          !!can_checksum_protocol(features, proto);
  
-       __skb_push(head_skb, doffset);
        headroom = skb_headroom(head_skb);
        pos = skb_headlen(head_skb);
  

diff --cc net/dns_resolver/dns_query.c
Simple merge

diff --cc net/ipv4/ip_tunnel.c
Simple merge

diff --cc net/ipv4/ipip.c
Simple merge

diff --cc net/ipv6/output_core.c
Simple merge

diff --cc net/ipv6/sit.c
Simple merge

diff --cc net/mac80211/iface.c
Simple merge