* linux-next: manual merge of the vhost tree with the kbuild tree
@ 2017-03-28 3:57 Stephen Rothwell
2017-03-28 4:00 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2017-03-28 3:57 UTC (permalink / raw)
To: Michael S. Tsirkin, Masahiro Yamada
Cc: linux-next, linux-kernel, Nicolas Dichtel
Hi Michael,
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.
I fixed it up (the former supercedes the latter, so I used the former)
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the vhost tree with the kbuild tree
2017-03-28 3:57 linux-next: manual merge of the vhost tree with the kbuild tree Stephen Rothwell
@ 2017-03-28 4:00 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2017-03-28 4:00 UTC (permalink / raw)
To: Michael S. Tsirkin, Masahiro Yamada
Cc: linux-next, linux-kernel, Nicolas Dichtel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-28 4:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-28 3:57 linux-next: manual merge of the vhost tree with the kbuild tree Stephen Rothwell
2017-03-28 4:00 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).