Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in
drivers/vhost/test.c between commit 73640c991e2f ("tools/virtio: fix
build for 3.8") from Linus' tree and commit 30954cbc5818 ("vhost-test:
fix up test module after API change") from the vhost tree.
I fixed it up (the former was a superset of the latter for the
conflicting area, so I used that) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp5UxtOVpubL.pgp
Description: PGP signature
