From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tudor Ambarus <Tudor.Ambarus@microchip•com>,
Vignesh Raghavendra <vigneshr@ti•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Thomas Gleixner <tglx@linutronix•de>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Ludovic Barre <ludovic.barre@st•com>
Subject: linux-next: manual merge of the spi-nor tree with Linus' tree
Date: Mon, 24 Jun 2019 13:23:41 +1000 [thread overview]
Message-ID: <20190624132341.7cdf1214@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2019-06-24 3:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190624132341.7cdf1214@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Tudor.Ambarus@microchip$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ludovic.barre@st$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=vigneshr@ti$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox