lkml.org 
[lkml]   [2017]   [Mar]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the vhost tree with the kbuild tree
Hi Michael,

On Tue, 28 Mar 2017 14:57:23 +1100 Stephen Rothwell <sfr@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

\
 
 \ /
  Last update: 2017-03-28 06:02    [W:0.030 / U:1.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site