linux-kernel - linux-next: manual merge of the nand tree with the mvebu tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20190207122509.68144d86@canb.auug.org.au>
Date:   Thu, 7 Feb 2019 12:25:09 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Miquel Raynal <miquel.raynal@...tlin.com>,
        Boris Brezillon <boris.brezillon@...tlin.com>,
        Jason Cooper <jason@...edaemon.net>,
        Andrew Lunn <andrew@...n.ch>,
        Gregory Clement <gregory.clement@...tlin.com>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Vladimir Vid <vladimir.vid@...tura.hr>,
        Jianxin Pan <jianxin.pan@...ogic.com>
Subject: linux-next: manual merge of the nand tree with the mvebu tree

Hi all,

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

  MAINTAINERS

between commit:

  2e73bb33366d ("arm64: dts: marvell: Add device tree for uDPU board")

from the mvebu tree and commit:

  0f416a463ecc ("MAINTAINERS: Add entry for Amlogic NAND controller driver")

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 MAINTAINERS
index 2d958beee76f,e6b902c7c828..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9887,11 -9849,13 +9887,18 @@@ F:	drivers/media/platform/meson/ao-cec.
  F:	Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:	git git://linuxtv.org/media_tree.git
  
+ MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
+ M:	Liang Yang <liang.yang@...ogic.com>
+ L:	linux-mtd@...ts.infradead.org
+ S:	Maintained
+ F:	drivers/mtd/nand/raw/meson_*
+ F:	Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
+ 
 +METHODE UDPU SUPPORT
 +M:	Vladimir Vid <vladimir.vid@...tura.hr>
 +S:	Maintained
 +F:	arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 +
  MICROBLAZE ARCHITECTURE
  M:	Michal Simek <monstr@...str.eu>
  W:	http://www.monstr.eu/fdt/

Content of type "application/pgp-signature" skipped