Skip to contentSkip to conversation

linux-next: manual merge of the nand tree with Linus' tree

PATCH Stephen Rothwell 1 participant 1 message Feb 18, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Boris,

Today's linux-next merge of the nand tree got a conflict in:

drivers/mtd/nand/Kconfig

between commit:

f23def803861 ("mtd: nand: MTD_NAND_MARVELL should depend on HAS_DMA")

from Linus' tree and commit:

93db446a424c ("mtd: nand: move raw NAND related code to the raw/ subdir")

from the nand tree.

I fixed it up (I used the latter version of this file and added the following merge fix patch) 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.

From: Stephen Rothwell <[email protected]>
Date: Mon, 19 Feb 2018 09:48:17 +1100
Subject: [PATCH] mtd: nand: fix up for raw Kconfig move

---
 drivers/mtd/nand/raw/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/Kconfig +1 -1
index e6b8c59f2c0d..736ac887303c 100644
@@ -328,7 +328,7 @@ config MTD_NAND_MARVELL
 	tristate "NAND controller support on Marvell boards"
 	depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \
 		   COMPILE_TEST
-	depends on HAS_IOMEM
+	depends on HAS_IOMEM && HAS_DMA
 	help
 	  This enables the NAND flash controller driver for Marvell boards,
 	  including:
Signature · 5 lines
2.15.1

-- 
Cheers,
Stephen Rothwell