linux-kernel - linux-next: manual merge of the spi tree with the mips 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: <20190124132759.1416fec0@canb.auug.org.au>
Date:   Thu, 24 Jan 2019 13:27:59 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mark Brown <broonie@...nel.org>,
        Ralf Baechle <ralf@...ux-mips.org>,
        James Hogan <jhogan@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        John Crispin <john@...ozen.org>,
        Paul Burton <paul.burton@...s.com>, Alban Bedel <albeu@...e.fr>
Subject: linux-next: manual merge of the spi tree with the mips tree

Hi Mark,

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

  arch/mips/ath79/dev-spi.h

between commit:

  85b9686dae30 ("MIPS: ath79: drop platform device registration code")

from the mips tree and commit:

  b172fd0c8980 ("spi: ath79: Enable support for compile test")

from the spi tree.

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