[GIT,PULL] mtd: spi-nor: Changes for 5.3
mbox series

Message ID 31356721-2ff3-13b2-d719-860357871aff@microchip.com
State Not Applicable
Headers show
Series
  • [GIT,PULL] mtd: spi-nor: Changes for 5.3
Related show

Pull-request

ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git tags/spi-nor/for-5.3

Message

Ambarus Tudor June 27, 2019, 9:31 a.m. UTC
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

for you to fetch changes up to 62de37da9f382455b983f2f92b10012109005278:

  mtd: spi-nor: intel-spi: Convert to use SPDX identifier (2019-06-22 14:59:27 +0300)

----------------------------------------------------------------
SPI-NOR core changes:
- add support for the mt25ql02g and w25q16jv flashes
- print error in case of jedec read id fails

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

----------------------------------------------------------------
Andrey Smirnov (1):
      mtd: spi-nor: Add Micron MT25QL02 support

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/

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/stm32-quadspi.txt |  43 ---
 drivers/mtd/spi-nor/Kconfig                             |   7 -
 drivers/mtd/spi-nor/Makefile                            |   1 -
 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                           |  12 +-
 drivers/mtd/spi-nor/stm32-quadspi.c                     | 720 -----------------------------------------
 include/linux/platform_data/intel-spi.h                 |   5 +-
 10 files changed, 16 insertions(+), 793 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mtd/stm32-quadspi.txt
 delete mode 100644 drivers/mtd/spi-nor/stm32-quadspi.c

Comments

Ambarus Tudor June 27, 2019, 1:40 p.m. UTC | #1
Hi,

My email server sometimes eats emails, this was the case with
https://patchwork.ozlabs.org/patch/1121411/ too.

I really want to have this in 5.3, so I'll make a spi-nor/for-5.3-v2 tag and
submit a new pull request soon.

Thanks, Vignesh, for the heads up!
ta


On 06/27/2019 12:31 PM, Tudor.Ambarus@microchip.com wrote:
> External E-Mail
> 
> 
> 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
> 
> for you to fetch changes up to 62de37da9f382455b983f2f92b10012109005278:
> 
>   mtd: spi-nor: intel-spi: Convert to use SPDX identifier (2019-06-22 14:59:27 +0300)
> 
> ----------------------------------------------------------------
> SPI-NOR core changes:
> - add support for the mt25ql02g and w25q16jv flashes
> - print error in case of jedec read id fails
> 
> 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
> 
> ----------------------------------------------------------------
> Andrey Smirnov (1):
>       mtd: spi-nor: Add Micron MT25QL02 support
> 
> 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/
> 
> 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/stm32-quadspi.txt |  43 ---
>  drivers/mtd/spi-nor/Kconfig                             |   7 -
>  drivers/mtd/spi-nor/Makefile                            |   1 -
>  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                           |  12 +-
>  drivers/mtd/spi-nor/stm32-quadspi.c                     | 720 -----------------------------------------
>  include/linux/platform_data/intel-spi.h                 |   5 +-
>  10 files changed, 16 insertions(+), 793 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/
> 
>