<Tudor.Ambarus@xxxxxxxxxxxxx> wrote on Wed, 25 Mar 2020 11:06:08 +0000: > On Wednesday, March 25, 2020 12:25:38 AM EET Miquel Raynal wrote: > > drivers/mtd/spi-nor/aspeed-smc.c | 2 +- > > drivers/mtd/spi-nor/spi-nor.c | 1 - > > Hi, Miquel, > > This will conflict with the SPI NOR changes that I made in spi-nor/for-5.7: I > moved all the SPI NOR controllers in /drivers/mtd/spi-nor/controllers and > drivers/mtd/spi-nor/spi-nor.c became drivers/mtd/spi-nor/core.c. Right, I based it on mtd/next. I will apply it after merging all your branchs and fix my patch if needed. Thanks, Miquèl ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/