From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Rusty Russell <rusty@rustcorp.com.au>,
Asias He <asias@redhat.com>
Subject: linux-next: manual merge of the vhost tree with the virtio tree
Date: Wed, 20 Feb 2013 16:00:28 +1100 [thread overview]
Message-ID: <20130220160028.42f2b3b94f5eea4b3f6d4779@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in
drivers/vhost/Makefile between commit 4d8dc8b44748 ("vringh: host-side
implementation of virtio rings") from the virtio tree and commit
0b87bfefde9a ("vhost-blk: Add vhost-blk support v6") from the vhost tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/vhost/Makefile
index 1d37f5e,1a8a4a5..0000000
--- a/drivers/vhost/Makefile
+++ b/drivers/vhost/Makefile
@@@ -2,5 -2,5 +2,7 @@@ obj-$(CONFIG_VHOST_NET) += vhost_net.
vhost_net-y := vhost.o net.o
obj-$(CONFIG_TCM_VHOST) += tcm_vhost.o
+
+obj-$(CONFIG_VHOST_RING) += vringh.o
+ obj-$(CONFIG_VHOST_BLK) += vhost_blk.o
+ vhost_blk-y := blk.o
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-02-20 5:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 5:00 Stephen Rothwell [this message]
2015-03-06 3:36 Stephen Rothwell
2015-04-20 4:54 Stephen Rothwell
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130220160028.42f2b3b94f5eea4b3f6d4779@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=asias@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
--cc=rusty@rustcorp.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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
all inboxes | Powered by JetHome®