archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: "Michael S. Tsirkin" <>,
	David Miller <>,
	Networking <>
Cc: Linux Next Mailing List <>,
	Linux Kernel Mailing List <>,
	Florian Westphal <>
Subject: linux-next: manual merge of the vhost tree with the net-next tree
Date: Wed, 3 Apr 2019 15:22:37 +1100	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1535 bytes --]

Hi all,

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


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.

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)
  	/* timestamp packet in software */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2019-04-03  4:22 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-03  4:22 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-06-16  4:19 linux-next: manual merge of the vhost tree with the net-next tree Stephen Rothwell
2013-04-29  7:29 Stephen Rothwell
2012-04-19  5:35 Stephen Rothwell
2012-04-19  5:40 ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).