Re: linux-next: manual merge of the kbuild tree with the input-current tree

[Masahiro Yamada]

Hi Stephen,


2017-03-28 7:55 GMT+09:00 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>:
> 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