Merge remote-tracking branch 'net-next/master'

diff --cc drivers/infiniband/hw/cxgb4/cm.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec.c
Simple merge

diff --cc drivers/net/ethernet/sfc/nic.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
Simple merge

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

diff --cc net/bridge/br_netlink.c
Simple merge

diff --cc net/core/dev.c
index d540ced1f6c66dc5b84a8ef06c24199e747a0f86,8c47ab243926280fcac36805467c2d88cb961bf1..de930b75171267004892382438d6e8c122f4720f
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -2208,20 -2208,12 +2208,12 @@@ out
  }
  EXPORT_SYMBOL(skb_checksum_help);
  
- /**
-  *    skb_mac_gso_segment - mac layer segmentation handler.
-  *    @skb: buffer to segment
-  *    @features: features for the output path (see dev->features)
-  */
- struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,
-                                   netdev_features_t features)
+ __be16 skb_network_protocol(struct sk_buff *skb)
  {
-       struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT);
-       struct packet_offload *ptype;
        __be16 type = skb->protocol;
 +      int vlan_depth = ETH_HLEN;
  
        while (type == htons(ETH_P_8021Q)) {
 -              int vlan_depth = ETH_HLEN;
                struct vlan_hdr *vh;
  
                if (unlikely(!pskb_may_pull(skb, vlan_depth + VLAN_HLEN)))

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

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

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

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

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

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

diff --cc net/openvswitch/datapath.c
Simple merge