* linux-next: manual merge of the mtd-fixes tree with Linus' tree
@ 2023-05-23 23:14 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2023-05-23 23:14 UTC (permalink / raw)
To: Boris Brezillon
Cc: Linus Torvalds, Linux Kernel Mailing List,
Linux Next Mailing List, Michal Simek, Miquel Raynal
[-- Attachment #1: Type: text/plain, Size: 1854 bytes --]
Hi all,
Today's linux-next merge of the mtd-fixes tree got a conflict in:
MAINTAINERS
between commit:
80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")
from Linus' tree and commit:
faa5e6cbb559 ("MAINTAINERS: Add myself as reviewer instead of Naga")
from the mtd-fixes 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 MAINTAINERS
index b484d589e51c,3678799f537c..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1761,22 -1771,6 +1761,22 @@@ S: Odd Fixe
F: drivers/mmc/host/mmci.*
F: include/linux/amba/mmci.h
+ARM PRIMECELL PL35X NAND CONTROLLER DRIVER
+M: Miquel Raynal <miquel.raynal@bootlin•com>
- M: Naga Sureshkumar Relli <nagasure@xilinx•com>
++R: Michal Simek <michal.simek@amd•com>
+L: linux-mtd@lists•infradead.org
+S: Maintained
+F: Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml
+F: drivers/mtd/nand/raw/pl35x-nand-controller.c
+
+ARM PRIMECELL PL35X SMC DRIVER
+M: Miquel Raynal <miquel.raynal@bootlin•com>
- M: Naga Sureshkumar Relli <nagasure@xilinx•com>
++R: Michal Simek <michal.simek@amd•com>
+L: linux-arm-kernel@lists•infradead.org (moderated for non-subscribers)
+S: Maintained
+F: Documentation/devicetree/bindings/memory-controllers/arm,pl35x-smc.yaml
+F: drivers/memory/pl353-smc.c
+
ARM PRIMECELL SSP PL022 SPI DRIVER
M: Linus Walleij <linus.walleij@linaro•org>
L: linux-arm-kernel@lists•infradead.org (moderated for non-subscribers)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-23 23:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-23 23:14 linux-next: manual merge of the mtd-fixes tree with Linus' tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox