archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: "Michael S. Tsirkin" <>,
	David Miller <>,
Subject: linux-next: manual merge of the vhost tree with the net-next tree
Date: Thu, 16 Jun 2016 14:19:57 +1000	[thread overview]
Message-ID: <> (raw)

Hi Michael,

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


between commit:

  9fb6bc5b4a78 ("ptr_ring: ring test")

from the net-next tree and commit:

  139ab4d4e68b ("tools/virtio: add noring tool")

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 tools/virtio/ringtest/Makefile
index 50e086c6a7b6,6173adae9f08..000000000000
--- a/tools/virtio/ringtest/Makefile
+++ b/tools/virtio/ringtest/Makefile
@@@ -1,6 -1,6 +1,6 @@@
- all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder ptr_ring
 -all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder noring
++all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder ptr_ring noring
  CFLAGS += -Wall
  CFLAGS += -pthread -O2 -ggdb
@@@ -16,13 -15,13 +16,15 @@@ ring: ring.o main.
  virtio_ring_0_9: virtio_ring_0_9.o main.o
  virtio_ring_poll: virtio_ring_poll.o main.o
  virtio_ring_inorder: virtio_ring_inorder.o main.o
 +ptr_ring: ptr_ring.o main.o
+ noring: noring.o main.o
  	-rm main.o
  	-rm ring.o ring
  	-rm virtio_ring_0_9.o virtio_ring_0_9
  	-rm virtio_ring_poll.o virtio_ring_poll
  	-rm virtio_ring_inorder.o virtio_ring_inorder
 +	-rm ptr_ring.o ptr_ring
+ 	-rm noring.o noring
  .PHONY: all clean

             reply	other threads:[~2016-06-16  4:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-16  4:19 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-04-03  4:22 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).