On Tuesday, May 26, 2020 12:36:04 PM EEST Vignesh Raghavendra wrote: > From: Ramuthevar Vadivel Murugan > <[email protected]> > > Now that cadence-quadspi has been converted to use spi-mem framework, > move it under drivers/spi/ > > Update license header to match SPI subsystem style > > Signed-off-by: Ramuthevar Vadivel Murugan > <[email protected]> Signed-off-by: Vignesh > Raghavendra <[email protected]> > --- > drivers/mtd/spi-nor/controllers/Kconfig | 11 ----------- > drivers/mtd/spi-nor/controllers/Makefile | 1 - > drivers/spi/Kconfig | 11 +++++++++++ > drivers/spi/Makefile | 1 + > .../spi-cadence-quadspi.c} | 14 +++++++------- > 5 files changed, 19 insertions(+), 19 deletions(-) > rename drivers/{mtd/spi-nor/controllers/cadence-quadspi.c => > spi/spi-cadence-quadspi.c} (99%)
I get a conflict when applying this on top of spi-nor/next.
