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

Both conflict were simple overlapping changes.

In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_dcbx.c
Simple merge

diff --cc drivers/net/usb/kaweth.c
index 3d8ea18df69608942b03e0dc5292d50ace557799,2a2c3edb6bad0b3bd257c3a101d100ad3b00cc59..37fb621fde86cb6f483151c4ffa54e76ff0bd319
--- 1/drivers/net/usb/kaweth.c
--- 2/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@@ -801,18 -803,12 +801,12 @@@ static netdev_tx_t kaweth_start_xmit(st
        }
  
        /* We now decide whether we can put our special header into the sk_buff */
-       if (skb_cloned(skb) || skb_headroom(skb) < 2) {
-               /* no such luck - we make our own */
-               struct sk_buff *copied_skb;
-               copied_skb = skb_copy_expand(skb, 2, 0, GFP_ATOMIC);
-               dev_kfree_skb_irq(skb);
-               skb = copied_skb;
-               if (!copied_skb) {
-                       net->stats.tx_errors++;
-                       netif_start_queue(net);
-                       spin_unlock_irq(&kaweth->device_lock);
-                       return NETDEV_TX_OK;
-               }
+       if (skb_cow_head(skb, 2)) {
 -              kaweth->stats.tx_errors++;
++              net->stats.tx_errors++;
+               netif_start_queue(net);
+               spin_unlock_irq(&kaweth->device_lock);
+               dev_kfree_skb_any(skb);
+               return NETDEV_TX_OK;
        }
  
        private_header = (__le16 *)__skb_push(skb, 2);

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

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

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

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

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

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

diff --cc net/key/af_key.c
Simple merge

diff --cc net/mac80211/rx.c
index 638dc63a51bf287a083d0099145db3bfe0ba77dd,4d7543d1a62cce8d70e2d6894ffb86920c80c241..2142074d9fb09cad1297cddd69add23f632b3fd6
--- 1/net/mac80211/rx.c
--- 2/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@@ -546,11 -594,11 +590,13 @@@ ieee80211_rx_monitor(struct ieee80211_l
                        return NULL;
                }
  
 -              return remove_monitor_info(local, origskb, rtap_vendor_space);
 +              remove_monitor_info(origskb, present_fcs_len,
 +                                  rtap_vendor_space);
 +              return origskb;
        }
  
+       ieee80211_handle_mu_mimo_mon(monitor_sdata, origskb, rtap_vendor_space);
+ 
        /* room for the radiotap header based on driver features */
        rt_hdrlen = ieee80211_rx_radiotap_hdrlen(local, status, origskb);
        needed_headroom = rt_hdrlen - rtap_vendor_space;

diff --cc net/qrtr/qrtr.c
Simple merge

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