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

[Stephen Rothwell]

Hi all,

On Wed, 8 Jul 2020 14:37:59 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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")
> 
> from the mtd tree and commit:
> 
>   ca7d8b980b67 ("memory: add Renesas RPC-IF driver")
> 
> from the spi tree.
> 
> I fixed it up (see below) 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.
> 
> 
> diff --cc drivers/memory/Kconfig
> index be69c07b8941,e438d79857da..000000000000
> --- a/drivers/memory/Kconfig
> +++ b/drivers/memory/Kconfig
> @@@ -174,16 -174,15 +174,25 @@@ config PL353_SM
>   	  This driver is for the ARM PL351/PL353 Static Memory
>   	  Controller(SMC) module.
>   
> + config RENESAS_RPCIF
> + 	tristate "Renesas RPC-IF driver"
> + 	depends on ARCH_RENESAS
> + 	select REGMAP_MMIO
> + 	help
> + 	  This supports Renesas R-Car Gen3 RPC-IF which provides either SPI
> + 	  host or HyperFlash. You'll have to select individual components
> + 	  under the corresponding menu.
> + 
>  +config STM32_FMC2_EBI
>  +	tristate "Support for FMC2 External Bus Interface on STM32MP SoCs"
>  +	depends on MACH_STM32MP157 || COMPILE_TEST
>  +	select MFD_SYSCON
>  +	help
>  +	  Select this option to enable the STM32 FMC2 External Bus Interface
>  +	  controller. This driver configures the transactions with external
>  +	  devices (like SRAM, ethernet adapters, FPGAs, LCD displays, ...) on
>  +	  SOCs containing the FMC2 External Bus Interface.
>  +
>   source "drivers/memory/samsung/Kconfig"
>   source "drivers/memory/tegra/Kconfig"
>   
> diff --cc drivers/memory/Makefile
> index d3d8d6ced342,d105f8ebe8b8..000000000000
> --- a/drivers/memory/Makefile
> +++ b/drivers/memory/Makefile
> @@@ -22,7 -22,7 +22,8 @@@ obj-$(CONFIG_JZ4780_NEMC)	+= jz4780-nem
>   obj-$(CONFIG_MTK_SMI)		+= mtk-smi.o
>   obj-$(CONFIG_DA8XX_DDRCTL)	+= da8xx-ddrctl.o
>   obj-$(CONFIG_PL353_SMC)		+= pl353-smc.o
> + obj-$(CONFIG_RENESAS_RPCIF)	+= renesas-rpc-if.o
>  +obj-$(CONFIG_STM32_FMC2_EBI)	+= stm32-fmc2-ebi.o
>   
>   obj-$(CONFIG_SAMSUNG_MC)	+= samsung/
>   obj-$(CONFIG_TEGRA_MC)		+= tegra/

This is now a conflict between the mtd tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp89SXUCIo3T.pgp
Description: OpenPGP digital signature