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:   Fri, 22 Nov 2019 14:50:18 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Bjorn Andersson <bjorn.andersson@linaro.org>,
        Rob Herring <robherring2@gmail.com>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Arnaud Pouliquen <arnaud.pouliquen@st.com>,
        Fabien Dessenne <fabien.dessenne@st.com>
Subject: linux-next: manual merge of the rpmsg tree with the devicetree tree
Message-ID: <20191122145018.5f8a3187@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/8SzoS3lxrnRaCQRI=qQTa5l";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/8SzoS3lxrnRaCQRI=qQTa5l
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  Documentation/devicetree/bindings/remoteproc/stm32-rproc.txt

between commit:

  34376eb1b084 ("dt-bindings: remoteproc: convert stm32-rproc to json-schem=
a")

from the devicetree tree and commit:

  14ea1d04ed0f ("dt-bindings: remoteproc: stm32: add wakeup-source")

from the rpmsg tree.

I fixed it up (I just deleted the file - more updates may be required)
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_/8SzoS3lxrnRaCQRI=qQTa5l
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3XWvoACgkQAVBC80lX
0GxYfAf/aJc5dhpYKSGf6lUXgArU9SBbp2CaxntSD93aunBwyflePrqjE4o4n1Oz
d6Ymu7vFEycv4BQbAjihSi9TxZqPf0KKXM18IXed/xzoxctt98PZxvL6M/apertL
uDFq87WbqcJqPe3cPh++Z1EeJ/tadA8Qnv7r0uvTRksbJpe4ub0C1fuEs1Hnhzr5
dmWLuD9vbU1806t02Icsy3W4eX/ElfsbIKNCc7ajqrTvZ4Vd8SRS77VsflCeWnYu
KXxebiKrqpo0yBoP4Q5pJenKEt87OCVfAr1OdfhgI0XQuNatHdG/0TFu4XPFV8cG
qP+/qdymnWSIRMO0Msr2mVNV17Pkzg==
=NLH0
-----END PGP SIGNATURE-----

--Sig_/8SzoS3lxrnRaCQRI=qQTa5l--