On Wed, Oct 18, 2023 at 01:13:34PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> Documentation/devicetree/bindings/usb/ti,tps6598x.yaml
>
> between commit:
>
> 47b8fb4aef95 ("dt-bindings: usb: ti,tps6598x: Disallow undefined properties")
>
> from the devicetree tree and commit:
>
> 6060d554e891 ("dt-bindings: usb: tps6598x: Add tps25750")
>
> from the usb 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, thanks!
greg k-h
