Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 15 Jun 2021 12:59:58 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Rob Herring <robherring2@gmail.com>,
        Richard Weinberger <richard.weinberger@gmail.com>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Miquel Raynal <miquel.raynal@bootlin.com>,
        Rob Herring <robh@kernel.org>,
        Vignesh Raghavendra <vigneshr@ti.com>
Subject: linux-next: manual merge of the devicetree tree with the mtd tree
Message-ID: <20210615125958.541c275c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/YvI6qDAJClwRfkq.S3UNUGH";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/YvI6qDAJClwRfkq.S3UNUGH
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt

between commit:

  6947ad674944 ("dt-bindings: mtd: Convert ti, am654-hbmc.txt to YAML schem=
a")

from the mtd tree and commit:

  9b358af7c818 ("dt-bindings: mux: Convert mux controller bindings to schem=
a")

from the devicetree tree.

I fixed it up (the latter removed the file, so I just did that) 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/YvI6qDAJClwRfkq.S3UNUGH
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmDIF64ACgkQAVBC80lX
0GxmvQgAkn00bNPpJC4YkZbdEeASyVcXrxStIhfiaLUYlbGc/fWiCoPYOqPjEYnB
UK1ITRJ39aTJNGff9jI02hTXZHBIP2Fo81pMsljjH7MQ4AY1SlP8vP64uFIvOyBO
Gmuaj0nmjGimzX+2oDNNGE7Y27hei4Pvy8WpTR+iALLao6KbuWBTgZ4DqoCFleaI
jPjNT7XlMO4yWhWVUSMfAjtxhR5NFqhPr7kkixmI5iwLOumxB7RL9skku3ln2SDv
agTXAf6PpEJ0nS2LR8ADTVQ+jpxloC88F+GRDZeq9xheWVdDr3f78PcsUHFhifly
7vxLUen3kOQUye8wHVsL4Z/9njwByQ==
=swxV
-----END PGP SIGNATURE-----

--Sig_/YvI6qDAJClwRfkq.S3UNUGH--