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

Conflicts:
	drivers/net/xen-netfront.c

Minor overlapping changes in xen-netfront.c, mostly to do
with some buffer management changes alongside the split
of stats into TX and RX.

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/chelsio/cxgb4vf/cxgb4vf_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
Simple merge

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

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

diff --cc drivers/net/ethernet/intel/i40e/i40e_txrx.c
Simple merge

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

diff --cc drivers/net/xen-netfront.c
index 01a4350eb313cdea4ee89b1d0c9fc811344662da,d8c10764f13061fd355e0e36abff7c83d3a458a5..7cfa6c027c0c2a6247243db2ffce474c70d6f8ac
--- 1/drivers/net/xen-netfront.c
--- 2/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@@ -518,15 -562,18 +517,15 @@@ static u16 xennet_select_queue(struct n
  
  static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
 -      unsigned short id;
        struct netfront_info *np = netdev_priv(dev);
-       struct netfront_stats *stats = this_cpu_ptr(np->stats);
+       struct netfront_stats *tx_stats = this_cpu_ptr(np->tx_stats);
 -      struct xen_netif_tx_request *tx;
 -      char *data = skb->data;
 -      RING_IDX i;
 -      grant_ref_t ref;
 -      unsigned long mfn;
 +      struct xen_netif_tx_request *tx, *first_tx;
 +      unsigned int i;
        int notify;
        int slots;
 -      unsigned int offset = offset_in_page(data);
 -      unsigned int len = skb_headlen(skb);
 +      struct page *page;
 +      unsigned int offset;
 +      unsigned int len;
        unsigned long flags;
        struct netfront_queue *queue = NULL;
        unsigned int num_queues = dev->real_num_tx_queues;

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

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

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

diff --cc net/packet/af_packet.c
Simple merge