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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Tue, 28 Mar 2017 09:52:27 +0900
From:   Masahiro Yamada <yamada.masahiro@...ionext.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Dmitry Torokhov <dmitry.torokhov@...il.com>,
        linux-next@...r.kernel.org,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Nicolas Dichtel <nicolas.dichtel@...nd.com>,
        Naohiro Aota <naota@...sp.net>
Subject: Re: linux-next: manual merge of the kbuild tree with the
 input-current tree

Hi Stephen,


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