linux-kernel - linux-next: manual merge of the spi-nor 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]

Message-ID: <20190624132341.7cdf1214@canb.auug.org.au>
Date:   Mon, 24 Jun 2019 13:23:41 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Tudor Ambarus <Tudor.Ambarus@...rochip.com>,
        Vignesh Raghavendra <vigneshr@...com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Ludovic Barre <ludovic.barre@...com>
Subject: linux-next: manual merge of the spi-nor tree with Linus' tree

Hi all,

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

  drivers/mtd/spi-nor/stm32-quadspi.c

between commit:

  caab277b1de0 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 234")

from Linus' tree and commit:

  df6bd6c002a4 ("mtd: spi-nor: stm32: remove the driver as it was replaced by spi-stm32-qspi.c")

from the spi-nor 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

Content of type "application/pgp-signature" skipped