linux-kernel - linux-next: manual merge of the kbuild tree with Linus' 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>] [day] [month] [year] [list]

Date:   Wed, 3 May 2017 08:14:25 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Masahiro Yamada <yamada.masahiro@...ionext.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Hans-Christian Noren Egtvedt <egtvedt@...fundet.no>,
        Håvard Skinnemoen <hskinnemoen@...il.com>,
        Nicolas Ferre <nicolas.ferre@...rochip.com>,
        Nicolas Dichtel <nicolas.dichtel@...nd.com>
Subject: linux-next: manual merge of the kbuild tree with Linus' tree

Hi Masahiro,

Today's linux-next merge of the kbuild tree got a conflict in:

  arch/avr32/include/uapi/asm/Kbuild

between commit:

  26202873bb51 ("avr32: remove support for AVR32 architecture")

from Linus' tree and commit:

  65017bab8a9e ("uapi: export all headers under uapi directories")

from the kbuild tree.

I fixed it up (I removed the file) 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