linux-kernel - linux-next: manual merge of the spi tree with the asm-generic 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: <20180315161133.0d3867a2@canb.auug.org.au>
Date:   Thu, 15 Mar 2018 16:11:33 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mark Brown <broonie@...nel.org>, Arnd Bergmann <arnd@...db.de>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Ulf Magnusson <ulfalizer@...il.com>
Subject: linux-next: manual merge of the spi tree with the asm-generic tree

Hi Mark,

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

  drivers/spi/Kconfig

between commit:

  588020dcb92a ("treewide: simplify Kconfig dependencies for removed archs")

from the asm-generic tree and commit:

  e3d001a0c29d ("spi: kconfig: Remove AVR32 dep. from SPI_ATMEL")

from the spi tree.

I fixed it up (I just used the former version) 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