This is strange, I can apply this patch on my tree without any conflicts.
Christophe Kerello <christophe.kerello@xxxxxx> wrote on Wed, 6 May 2020
11:11:13 +0200:
This patch renames functions and local variables.
This cleanup is done to get all functions starting by stm32_fmc2_nfc
in the FMC2 raw NAND driver when all functions will start by
stm32_fmc2_ebi in the FMC2 EBI driver.
Signed-off-by: Christophe Kerello <christophe.kerello@xxxxxx>
Reviewed-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
Applied to nand/next as well but for an unknown reason I had to do it
by hand because the patch would not apply.
Thanks,
MiquÃl