Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 31 Jul 2023 00:41:49 +0000 (10:41 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 31 Jul 2023 00:41:49 +0000 (10:41 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 31 Jul 2023 00:41:49 +0000 (10:41 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 31 Jul 2023 00:41:49 +0000 (10:41 +1000)
diff --cc drivers/mtd/nand/raw/fsl_upm.c
Simple merge
diff --cc drivers/mtd/nand/raw/meson_nand.c
Simple merge
diff --cc drivers/mtd/nand/raw/rockchip-nand-controller.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 31 Jul 2023 00:41:49 +0000 (10:41 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 31 Jul 2023 00:41:49 +0000 (10:41 +1000)
		1	2
drivers/mtd/nand/raw/fsl_upm.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/raw/meson_nand.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/raw/rockchip-nand-controller.c	patch \|	diff1 \|	diff2 \|	blob \| history