linux-kernel - linux-next: manual merge of the mips-james tree with the mips-fixes 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]

Message-ID: <20180516091347.1763527b@canb.auug.org.au>
Date:   Wed, 16 May 2018 09:14:10 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Ralf Baechle <ralf@...ux-mips.org>,
        James Hogan <james.hogan@...tec.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Alexandre Belloni <alexandre.belloni@...tlin.com>,
        Masahiro Yamada <yamada.masahiro@...ionext.com>
Subject: linux-next: manual merge of the mips-james tree with the mips-fixes
 tree

Hi all,

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

  arch/mips/boot/dts/xilfpga/Makefile

between commit:

  a5a92abbce56 ("MIPS: xilfpga: Stop generating useless dtb.o")

from the mips-fixes tree and commit:

  fca3aa166422 ("MIPS: dts: Avoid unneeded built-in.a in DTS dirs")

from the mips-james tree.

I fixed it up (I just used the former update to this 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

Content of type "application/pgp-signature" skipped