linux-next: manual merge of the nand tree with the mtd-fixes tree

[Stephen Rothwell]

Hi all,

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

  drivers/mtd/nand/onenand/Kconfig

between commit:

  c717b9b7d6de ("mtd: onenand: omap2: add dependency on GPMC")

from the mtd-fixes tree and commit:

  b46ff0780f17 ("mtd: onenand: omap2: Drop obsolete dependency on COMPILE_TEST")

from the nand tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/mtd/nand/onenand/Kconfig
index c94bf483541e,5c240533cea4..000000000000
--- a/drivers/mtd/nand/onenand/Kconfig
+++ b/drivers/mtd/nand/onenand/Kconfig
@@@ -25,8 -25,7 +25,8 @@@ config MTD_ONENAND_GENERI
  config MTD_ONENAND_OMAP2
  	tristate "OneNAND on OMAP2/OMAP3 support"
  	depends on ARCH_OMAP2 || ARCH_OMAP3 || (COMPILE_TEST && ARM)
- 	depends on OF || COMPILE_TEST
+ 	depends on OF
 +	depends on OMAP_GPMC
  	help
  	  Support for a OneNAND flash device connected to an OMAP2/OMAP3 SoC
  	  via the GPMC memory controller.

Attachment: pgpmKf63OBU2L.pgp
Description: OpenPGP digital signature