Re: linux-next: manual merge of the spi tree with the mtd tree

Hi all, On Wed, 8 Jul 2020 14:37:59 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the spi tree got conflicts in: > > drivers/memory/Kconfig > drivers/memory/Makefile > > between commit: > > 66b8173a197f ("memory: stm32-fmc2-ebi: add STM32 FMC2 EBI controller > driver")

linux-next: manual merge of the spi tree with the mtd tree

Hi all, Today's linux-next merge of the spi tree got conflicts in: drivers/memory/Kconfig drivers/memory/Makefile between commit: 66b8173a197f ("memory: stm32-fmc2-ebi: add STM32 FMC2 EBI controller driver") from the mtd tree and commit: ca7d8b980b67 ("memory: add Renesas RPC-IF drive