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

Conflicts:
	drivers/net/ethernet/marvell/mvneta.c

The mvneta.c conflict is a case of overlapping changes,
a conversion to devm_ioremap_resource() vs. a conversion
to netdev_alloc_pcpu_stats.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

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

diff --cc drivers/net/ethernet/qlogic/qlge/qlge_main.c
Simple merge

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

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

diff --cc drivers/net/virtio_net.c
index 99fa48c,841b608..6f15d9b
--- 1/drivers/net/virtio_net.c
--- 2/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -883,9 -882,10 +882,10 @@@ static netdev_tx_t start_xmit(struct sk
                        dev_warn(&dev->dev,
                                 "Unexpected TXQ (%d) queue failure: %d\n", qnum, err);
                dev->stats.tx_dropped++;
 -              kfree_skb(skb);
 +              dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
+       virtqueue_kick(sq->vq);
  
        /* Don't wait up for transmitted skbs to be freed. */
        skb_orphan(skb);

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

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

diff --cc net/8021q/vlan_dev.c
Simple merge

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

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

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

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

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

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

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

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