linux-next: manual merge of the nand tree with the drivers-memory tree

[Stephen Rothwell]

Hi all,

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

  drivers/mtd/nand/raw/omap2.c

between commit:

  f2f8115fe8b3 ("memory: omap-gpmc: Use a compatible match table when checking for NAND controller")

from the drivers-memory tree and commit:

  0137c74ad873 ("mtd: rawnand: omap2: Add compatible for AM64 SoC")

from the nand tree.

I fixed it up (I used the former version and added the following 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 <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 23 Dec 2021 10:41:35 +1100
Subject: [PATCH] fixup for "memory: omap-gpmc: Use a compatible match table when checking for NAND controller"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 include/linux/platform_data/mtd-nand-omap2.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h
index 92f011805ad4..8c2f1f185353 100644
--- a/include/linux/platform_data/mtd-nand-omap2.h
+++ b/include/linux/platform_data/mtd-nand-omap2.h
@@ -65,6 +65,7 @@ struct gpmc_nand_regs {
 
 static const struct of_device_id omap_nand_ids[] = {
 	{ .compatible = "ti,omap2-nand", },
+	{ .compatible = "ti,am64-nand", },
 	{},
 };
 
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

Attachment: pgpdEe1YhmhKe.pgp
Description: OpenPGP digital signature