Re: linux-next: manual merge of the devicetree tree with the usb tree

[Greg KH]

On Mon, Dec 18, 2023 at 04:48:12PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the devicetree tree got a conflict in:
> 
>   Documentation/devicetree/bindings/connector/usb-connector.yaml
> 
> between commits:
> 
>   76cd718a9ffd ("dt-bindings: connector: usb: add accessory mode description")
>   d1756ac67e7f ("dt-bindings: connector: usb: add altmodes description")
> 
> from the usb tree and commit:
> 
>   0d3a771610d0 ("dt-bindings: connector: Add child nodes for multiple PD capabilities")
> 
> from the devicetree tree.
> 
> I fixed it up (see below) 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.

Looks good to me, thanks!

greg k-h