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

[Stephen Rothwell]

Hi all,

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

  drivers/mtd/nand/raw/qcom_nandc.c

between commit:

  c2fc6b694790 ("mtd: Explicitly include correct DT includes")

from the mtd tree and commit:

  93ca966b4a20 ("mtd: rawnand: qcom: Sort includes alphabetically")

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/raw/qcom_nandc.c
index df245353b12b,997710779fe1..000000000000
--- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@@ -2,19 -2,19 +2,19 @@@
  /*
   * Copyright (c) 2016, The Linux Foundation. All rights reserved.
   */
+ #include <linux/bitops.h>
  #include <linux/clk.h>
+ #include <linux/delay.h>
+ #include <linux/dmaengine.h>
+ #include <linux/dma-mapping.h>
+ #include <linux/dma/qcom_adm.h>
+ #include <linux/dma/qcom_bam_dma.h>
+ #include <linux/module.h>
+ #include <linux/mtd/partitions.h>
+ #include <linux/mtd/rawnand.h>
+ #include <linux/of.h>
 -#include <linux/of_device.h>
 +#include <linux/platform_device.h>
  #include <linux/slab.h>
- #include <linux/bitops.h>
- #include <linux/dma/qcom_adm.h>
- #include <linux/dma-mapping.h>
- #include <linux/dmaengine.h>
- #include <linux/module.h>
- #include <linux/mtd/rawnand.h>
- #include <linux/mtd/partitions.h>
- #include <linux/of.h>
- #include <linux/delay.h>
- #include <linux/dma/qcom_bam_dma.h>
  
  /* NANDc reg offsets */
  #define	NAND_FLASH_CMD			0x00

Attachment: pgp2iESKXPwSS.pgp
Description: OpenPGP digital signature