Hi Michael,
On Tue, 28 Mar 2017 14:57:23 +1100 Stephen Rothwell <s...@canb.auug.org.au>
wrote:
>
> Today's linux-next merge of the vhost tree got a conflict in:
>
> include/uapi/linux/Kbuild
>
> between commit:
>
> 65017bab8a9e ("uapi: export all headers under uapi directories")
>
> from the kbuild tree and commit:
>
> 80363894995b ("virtio_mmio: expose header to userspace")
>
> from the vhost tree.
In fact, the vhost tree should be cleaned up as that patch has been
committed to Linus's tree as a different commit.
--
Cheers,
Stephen Rothwell
