* linux-next: manual merge of the kbuild tree with the input-current tree
@ 2017-03-27 22:55 Stephen Rothwell
2017-03-28 0:52 ` Masahiro Yamada
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2017-03-27 22:55 UTC (permalink / raw)
To: Masahiro Yamada, Dmitry Torokhov
Cc: linux-next, linux-kernel, Nicolas Dichtel, Naohiro Aota
Hi Masahiro,
Today's linux-next merge of the kbuild tree got a conflict in:
include/uapi/linux/Kbuild
between commit:
5659495a7a14 ("uapi: add missing install of userio.h")
from the input-current tree and commit:
65017bab8a9e ("uapi: export all headers under uapi directories")
from the kbuild tree.
I fixed it up (the latter supercedes the former, so I just used it) 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 kbuild tree with the input-current tree
2017-03-27 22:55 linux-next: manual merge of the kbuild tree with the input-current tree Stephen Rothwell
@ 2017-03-28 0:52 ` Masahiro Yamada
0 siblings, 0 replies; 2+ messages in thread
From: Masahiro Yamada @ 2017-03-28 0:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dmitry Torokhov, linux-next, Linux Kernel Mailing List,
Nicolas Dichtel, Naohiro Aota
Hi Stephen,
2017-03-28 7:55 GMT+09:00 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi Masahiro,
>
> Today's linux-next merge of the kbuild tree got a conflict in:
>
> include/uapi/linux/Kbuild
>
> between commit:
>
> 5659495a7a14 ("uapi: add missing install of userio.h")
>
> from the input-current tree and commit:
>
> 65017bab8a9e ("uapi: export all headers under uapi directories")
>
> from the kbuild tree.
>
> I fixed it up (the latter supercedes the former, so I just used it) and
> can carry the fix as necessary.
Right. header-y is no longer needed to export headers.
Thanks!
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-28 0:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-27 22:55 linux-next: manual merge of the kbuild tree with the input-current tree Stephen Rothwell
2017-03-28 0:52 ` Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox