Hi Michael, Today's linux-next merge of the vhost tree got a conflict in drivers/virtio/virtio_balloon.c between commit df81b29c7b81 ("virtio_balloon: transitional interface") from the virtio tree and commit 263f23c089f2 ("virtio_balloon: transitional interface") from the vhost tree.
I fixed it up (by using the version of the files from the virtio tree) and can carry the fix as necessary. Please clean up this mess ... -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgp0hWYK27G_l.pgp
Description: OpenPGP digital signature