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:   Thu, 28 May 2020 16:22:15 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Rob Herring <robherring2@gmail.com>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Sandeep Maheswaram <sanm@codeaurora.org>,
        Felipe Balbi <balbi@kernel.org>
Subject: linux-next: manual merge of the usb tree with the devicetree tree
Message-ID: <20200528162215.3a9aa663@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/3vZuWlHWNFvmOkWX=eeyRBv";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

Hi all,

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

  Documentation/devicetree/bindings/usb/qcom,dwc3.yaml

between commit:

  3828026c9ec8 ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")

from the devicetree tree and commits:

  cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")

from the usb tree.

I fixed it up (I guessed, taking most changes from the former) 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_/3vZuWlHWNFvmOkWX=eeyRBv
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7PWJcACgkQAVBC80lX
0GwbGAf+LlyXFd1Cnvh8G7uCCS8QpF5UcrqklncoPKY4BOSMHyONLIT02THHgmQ3
IEvTFY4Sl/XBh2o2BEmQ7idZ9LZi7Oidr6RqKcEmxrTUrL0Kk/g8AMs7wZ6bZjTZ
CaMmNmEzwgTbSEnf35f+s882C0SHkc/iOcyba5l236tVQfS5qTlaoHSAOy7b8y0o
Ykw9yZF5kCS6V0dH/WAsu/DRTQhjj/fXpsUefBhMbOy2/JRRyXC+E/LAT+/sTg4p
Fy2flrWCTXHSXe/KezLXoQ5eYzd5uWCG/G1YXwD5/iv4D3O8yZOG42d7TbPLZ8QG
xfb2pWI7TxilRKAM/RFwlaU6IMT/0A==
=eqBq
-----END PGP SIGNATURE-----

--Sig_/3vZuWlHWNFvmOkWX=eeyRBv--