linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20170328095532.04abad61@canb.auug.org.au>
Date:   Tue, 28 Mar 2017 09:55:32 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Masahiro Yamada <yamada.masahiro@...ionext.com>,
        Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Nicolas Dichtel <nicolas.dichtel@...nd.com>,
        Naohiro Aota <naota@...sp.net>
Subject: linux-next: manual merge of the kbuild tree with the input-current
 tree

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