From: <Tudor.Ambarus@microchip.com>
To: <richard@nod.at>, <boris.brezillon@collabora.com>,
<miquel.raynal@bootlin.com>, <vigneshr@ti.com>,
<marek.vasut@gmail.com>, <computersforpeace@gmail.com>,
<dwmw2@infradead.org>
Cc: linux-mtd@lists.infradead.org
Subject: [GIT PULL v2] mtd: spi-nor: Changes for 5.3
Date: Fri, 28 Jun 2019 09:00:32 +0000 [thread overview]
Message-ID: <166a1e4f-9ed0-ade5-cae4-841fa97036ce@microchip.com> (raw)
Hi,
There are two conflicts related to the SPDX treewide changes. The first conflict is
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/next branch.
The fix is to remove drivers/mtd/spi-nor/stm32-quadspi.c as the driver was replaced
by spi-stm32-qspi.c
The second conflict is in:
drivers/mtd/spi-nor/intel-spi-pci.c
drivers/mtd/spi-nor/intel-spi-platform.c
drivers/mtd/spi-nor/intel-spi.c
drivers/mtd/spi-nor/intel-spi.h
include/linux/platform_data/intel-spi.h
between commit:
d2912cb15bdd ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500")
from Linus' tree and commit:
62de37da9f38 ("mtd: spi-nor: intel-spi: Convert to use SPDX identifier")
from the spi-nor/next branch.
The fix is to keep the SPDX treewide change.
Cheers,
ta
The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
are available in the git repository at:
ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git tags/spi-nor/for-5.3-v2
for you to fetch changes up to 8d1336c241bdadf61a56e398d82d1e512dbff5f8:
mtd: spi-nor: cadence-quadspi: add reset control (2019-06-27 17:18:13 +0300)
----------------------------------------------------------------
SPI-NOR core changes:
- add support for the mt25ql02g and w25q16jv flashes
- print error in case of jedec read id fails
- is25lp256: add post BFPT fix to correct the addr_width
SPI NOR controller drivers changes:
- intel-spi: Add support for Intel Elkhart Lake SPI serial flash
- smt32: remove the driver as the driver was replaced by spi-stm32-qspi.c
- cadence-quadspi: add reset control
----------------------------------------------------------------
Andrey Smirnov (1):
mtd: spi-nor: Add Micron MT25QL02 support
Dinh Nguyen (2):
dt-bindings: cadence-quadspi: add options reset property
mtd: spi-nor: cadence-quadspi: add reset control
Flavio Suligoi (1):
mtd: spi-nor: change "error reading JEDEC id" from dbg to err
Geert Uytterhoeven (1):
mtd: spi-nor: Spelling s/Writ/Write/
Liu Xiang (1):
mtd: spi-nor: fix nor->addr_width when its value configured from SFDP does not match the actual width
Ludovic Barre (1):
mtd: spi-nor: stm32: remove the driver as it was replaced by spi-stm32-qspi.c
Mika Westerberg (2):
mtd: spi-nor: intel-spi: Add support for Intel Elkhart Lake SPI serial flash
mtd: spi-nor: intel-spi: Convert to use SPDX identifier
Robert Marko (1):
mtd: spi-nor: Add Winbond w25q16jv support
Documentation/devicetree/bindings/mtd/cadence-quadspi.txt | 5 ++
Documentation/devicetree/bindings/mtd/stm32-quadspi.txt | 43 ---------
drivers/mtd/spi-nor/Kconfig | 7 --
drivers/mtd/spi-nor/Makefile | 1 -
drivers/mtd/spi-nor/cadence-quadspi.c | 21 +++++
drivers/mtd/spi-nor/intel-spi-pci.c | 6 +-
drivers/mtd/spi-nor/intel-spi-platform.c | 5 +-
drivers/mtd/spi-nor/intel-spi.c | 5 +-
drivers/mtd/spi-nor/intel-spi.h | 5 +-
drivers/mtd/spi-nor/spi-nor.c | 37 +++++++-
drivers/mtd/spi-nor/stm32-quadspi.c | 720 --------------------------------------------------------------------------------------------------------------------------------------------------
include/linux/platform_data/intel-spi.h | 5 +-
12 files changed, 66 insertions(+), 794 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/mtd/stm32-quadspi.txt
delete mode 100644 drivers/mtd/spi-nor/stm32-quadspi.c
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next reply other threads:[~2019-06-28 9:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-28 9:00 Tudor.Ambarus [this message]
2019-07-07 20:59 ` [GIT PULL v2] mtd: spi-nor: Changes for 5.3 Miquel Raynal
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=166a1e4f-9ed0-ade5-cae4-841fa97036ce@microchip.com \
--to=tudor.ambarus@microchip.com \
--cc=boris.brezillon@collabora.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).