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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/lantiq_etop.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_tx.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
Simple merge

diff --cc drivers/net/ethernet/tile/tilegx.c
Simple merge

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

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

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/main.c
index 2d6f5e1,8bb8988..4d79761
--- 1/drivers/net/wireless/mwifiex/main.c
--- 2/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@@ -747,9 -746,10 +747,10 @@@ static struct net_device_stats *mwifiex
  }
  
  static u16
- mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb)
+ mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb,
+                               void *accel_priv)
  {
 -      skb->priority = cfg80211_classify8021d(skb);
 +      skb->priority = cfg80211_classify8021d(skb, NULL);
        return mwifiex_1d_to_wmm_queue[skb->priority];
  }
  

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

diff --cc net/core/dev.c
index 87312dc,0ce469e..2bee805
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -2529,8 -2523,23 +2529,8 @@@ netdev_features_t netif_skb_features(st
  }
  EXPORT_SYMBOL(netif_skb_features);
  
 -/*
 - * Returns true if either:
 - *    1. skb has frag_list and the device doesn't support FRAGLIST, or
 - *    2. skb is fragmented and the device does not support SG.
 - */
 -static inline int skb_needs_linearize(struct sk_buff *skb,
 -                                    netdev_features_t features)
 -{
 -      return skb_is_nonlinear(skb) &&
 -                      ((skb_has_frag_list(skb) &&
 -                              !(features & NETIF_F_FRAGLIST)) ||
 -                      (skb_shinfo(skb)->nr_frags &&
 -                              !(features & NETIF_F_SG)));
 -}
 -
  int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
-                       struct netdev_queue *txq, void *accel_priv)
+                       struct netdev_queue *txq)
  {
        const struct net_device_ops *ops = dev->netdev_ops;
        int rc = NETDEV_TX_OK;

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

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

diff --cc net/ipv6/ip6_vti.c
index b50acd5,7b42d5e..2d19272
--- 1/net/ipv6/ip6_vti.c
--- 2/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@@ -734,9 -736,14 +735,14 @@@ static inline int vti6_dev_init_gen(str
  
        t->dev = dev;
        t->net = dev_net(dev);
 -      dev->tstats = alloc_percpu(struct pcpu_tstats);
 +      dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
        if (!dev->tstats)
                return -ENOMEM;
 -              struct pcpu_tstats *stats;
+       for_each_possible_cpu(i) {
++              struct pcpu_sw_netstats *stats;
+               stats = per_cpu_ptr(dev->tstats, i);
+               u64_stats_init(&stats->syncp);
+       }
        return 0;
  }
  

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

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

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

diff --cc net/sched/sch_generic.c
Simple merge

diff --cc net/tipc/link.c
Simple merge