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:   Thu, 28 Nov 2019 11:41:27 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jassi Brar <jaswinder.singh@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 mailbox tree with the devicetree
 tree
Message-ID: <20191128114127.0f1e3b06@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/SuKzyasq5wvNffpko8PqMji";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

Hi all,

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

  Documentation/devicetree/bindings/mailbox/stm32-ipcc.txt

between commit:

  4360bf724483 ("dt-bindings: mailbox: convert stm32-ipcc to json-schema")

from the devicetree tree and commit:

  9b2cfd3fb09e ("dt-bindings: mailbox: stm32-ipcc: Updates for wakeup manag=
ement")

from the mailbox tree.

I fixed it up (I just deleted the file - presumably there will need to be
followup fixes to the json file) 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_/SuKzyasq5wvNffpko8PqMji
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3fF7cACgkQAVBC80lX
0GwLYQf/emideZaY5M6Jnfk8OIRnEQAB6SNldtdMGUjBgHzw+z6NDiKLe2vsP0c4
+NdFaTx6+FfP/gua8ZbvDZhmIqcci0Hht1cHEM1FdIQcG7xCkjItnvqkt8jyvUuF
qRC8n6yR/mRaTNK+Jf/t3QX0nQcn8l3m1cOJsuEssqdJoLU4dEoVzvL+j6AINJgu
KlpUgXsr/KuRF4ZInIsbvUK7Nl++EO5RcM9q6PQJmk3ViYOPsheV5XCHfC7DGk8y
ao2V3kB1gbK+PGdKpoYfxgzC93d1/TbXaCWeF+Y9rBPJ7fahGNmzxeL/b7pM+cW0
mKiqXfHQ4FgE7llu1nxb8NFIDiE0gg==
=x9/m
-----END PGP SIGNATURE-----

--Sig_/SuKzyasq5wvNffpko8PqMji--