Received-SPF: pass (google.com: domain of linux-kernel+bounces-19074-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Mon, 8 Jan 2024 15:00:26 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robh@kernel.org>, Greg KH <greg@kroah.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Kyle Tso
 <kyletso@google.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the devicetree tree with the usb tree
Message-ID: <20240108150026.2c5930a4@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/nGXUT6ynV7LJ=XDwtFSJuTR";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/nGXUT6ynV7LJ=XDwtFSJuTR
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/connector/usb-connector.yaml

between commit:

  501b15207138 ("dt-bindings: connector: Add child nodes for multiple PD ca=
pabilities")

from the usb tree and commit:

  0d3a771610d0 ("dt-bindings: connector: Add child nodes for multiple PD ca=
pabilities")

from the devicetree tree.

I fixed it up (I used the former version as there were other changes
in this file in that version) 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_/nGXUT6ynV7LJ=XDwtFSJuTR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWbc1oACgkQAVBC80lX
0GxAuwgAk2wG3m2LPCX8vvELuAaf22OVt6Cd5F9elyfgyIiiUcQUxmh1F9Q6b7uE
XOJSILsKRYePW7QffT0akWwWGlni+Ze6faPXWG7rVXeaULyYQ63PVoZ/YMrYUyRd
ym9jS6xwZNqTvEVFxFZQ+aJIycWaQ4ykEWnEKe4P8v3RzhKFQGBEJzfrlKkvZcuK
zOSvKteA/EETbfmEUgDZiTy8bi6B3aLzs7YW4p+r5xQ8aAjzAIYpXNu1qHBizvYl
gpVjfkU9EiXc1u8LZ3DlReW93pWhqFeY42m0AeLd/VJW42n+jYc2JeyW24ghTRnb
R6HgJi0ZaJVHFSVeHgjqGnGe/PpUzg==
=IyDL
-----END PGP SIGNATURE-----

--Sig_/nGXUT6ynV7LJ=XDwtFSJuTR--