Subject: linux-next: manual merge of the vhost tree with the net-next tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 3 Apr 2019 15:22:37 +1100

Hi all,

Today's linux-next merge of the vhost tree got a conflict in:

  drivers/net/virtio_net.c

between commit:

  6b16f9ee89b8 ("net: move skb->xmit_more hint to softnet data")

from the net-next tree and commit:

  916faccfe56d ("virtio-net: bql support")

from the vhost tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/virtio_net.c
index ba246fc475ae,955b3e76eb8d..000000000000
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -1568,13 -1571,15 +1572,15 @@@ static netdev_tx_t start_xmit(struct sk
  	struct send_queue *sq = &vi->sq[qnum];
  	int err;
  	struct netdev_queue *txq = netdev_get_tx_queue(dev, qnum);
- 	bool kick = !netdev_xmit_more();
 -	bool more = skb->xmit_more;
++	bool more = netdev_xmit_more();
  	bool use_napi = sq->napi.weight;
+ 	unsigned int bytes = skb->len;
+ 	bool kick;
  
  	/* Free up any pending old buffers before queueing new ones. */
- 	free_old_xmit_skbs(sq, false);
+ 	free_old_xmit_skbs(sq, txq, false);
  
- 	if (use_napi && kick)
+ 	if (use_napi && !more)
  		virtqueue_enable_cb_delayed(sq->vq);
  
  	/* timestamp packet in software */