linux-next: manual merge of the mtd-fixes tree with Linus' tree
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.
Signature · 32 lines
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 <[email protected]> - M: Naga Sureshkumar Relli <[email protected]> ++R: Michal Simek <[email protected]> +L: [email protected] +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 <[email protected]> - M: Naga Sureshkumar Relli <[email protected]> ++R: Michal Simek <[email protected]> +L: [email protected] (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 <[email protected]> L: [email protected] (moderated for non-subscribers)