From: David S. Miller <davem@davemloft.net>
Date: Sat, 29 Mar 2014 22:48:54 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: Ubuntu-5.10.0-12.13~17182^2~32
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=64c27237a07129758e33f5f824ba5c33b7f57417;p=mirror_ubuntu-hirsute-kernel.git

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>
---

64c27237a07129758e33f5f824ba5c33b7f57417
diff --cc drivers/net/virtio_net.c
index 99fa48c941c6,841b60831df1..6f15d9b315a1
--- a/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);