* linux-next: manual merge of the spi-nor tree with Linus' tree
@ 2019-06-24 3:23 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-06-24 3:23 UTC (permalink / raw)
To: Tudor Ambarus, Vignesh Raghavendra
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Thomas Gleixner, Greg Kroah-Hartman, Ludovic Barre
[-- Attachment #1: Type: text/plain, Size: 803 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-06-24 3:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-24 3:23 linux-next: manual merge of the spi-nor tree with Linus' tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).