Messages in this thread | | | Date | Wed, 20 Feb 2013 16:00:28 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vhost tree with the virtio tree |
| |
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 [unhandled content-type:application/pgp-signature] | |