Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 24 Jul 2019 13:02:52 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Rob Herring <robherring2@gmail.com>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Luca Weiss <luca@z3ntu.xyz>,
        Maxime Ripard <maxime.ripard@bootlin.com>
Subject: linux-next: manual merge of the devicetree tree with Linus' tree
Message-ID: <20190724130252.7c29bba9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/pho=2pwViQ=W7E09FHEbr.j";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/pho=2pwViQ=W7E09FHEbr.j
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/input/sun4i-lradc-keys.txt

between commit:

  355fb0e54e85 ("dt-bindings: input: sun4i-lradc-keys: Add A64 compatible")

from Linus' tree and commit:

  3f587b3b77b9 ("dt-bindings: input: Convert Allwinner LRADC to a schema")

from the devicetree tree.

I fixed it up (I removed the file - the additions from the former
have been incorporated into the latter) 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_/pho=2pwViQ=W7E09FHEbr.j
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl03ylwACgkQAVBC80lX
0Gz7sQf+OjXfLS22yQioQ3PX2SssOVpP/LU0FoLhhIbvCo/Hfz+n2SqG4w2Z81xp
JaM0e+4xmBB/aFbGpzr0HHxNp++A/UgnTGztij2YQjjKIoB9DFzqPcax+RYJhr0Y
Xyf29d1c1NH+dynQu+mwretgjGyXsHntVhwYDE6YGk/vEdZpHuSEqvhE7oJtQ5d6
g+Yf/qdKZ3LLdp8H5l9snCXLFWKHJkO0uCPx75QZj7knn9r3rIYQFkE0Bqxg4Ssd
Z281sl132fdAtmc7nlvga+WlD97qHsFTDqSguAFvb+hwlFWnZUDoStEb5Pmd8xXv
BoZGpFibLV1itCKPAZKpWSHZx+VV2Q==
=UdgU
-----END PGP SIGNATURE-----

--Sig_/pho=2pwViQ=W7E09FHEbr.j--