2024-02-22 04:38:42

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the usb tree with the regulator tree

Hi all,

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

Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml

between commits:

ec29a4d9b7c7 ("dt-bindings: regulator: qcom,usb-vbus-regulator: Add PM6150 compatible")
b9262cc1b988 ("regulator: dt-bindings: qcom,usb-vbus-regulator: add support for PM4125")

from the regulator tree and commit:

ef6035d2f1f4 ("dt-bindings: regulator: qcom,usb-vbus-regulator: add support for PMI632")

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.

--
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
index 8afb40c67af3,66dcd5ce03e6..000000000000
--- a/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
@@@ -24,8 -24,7 +24,9 @@@ properties
- qcom,pm8150b-vbus-reg
- items:
- enum:
+ - qcom,pm4125-vbus-reg
+ - qcom,pm6150-vbus-reg
+ - qcom,pmi632-vbus-reg
- const: qcom,pm8150b-vbus-reg

reg:

Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2024-02-22 07:42:29

by Greg KH

[permalink] [raw]
Subject: Re: linux-next: manual merge of the usb tree with the regulator tree

On Thu, Feb 22, 2024 at 03:38:26PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
>
> between commits:
>
> ec29a4d9b7c7 ("dt-bindings: regulator: qcom,usb-vbus-regulator: Add PM6150 compatible")
> b9262cc1b988 ("regulator: dt-bindings: qcom,usb-vbus-regulator: add support for PM4125")
>
> from the regulator tree and commit:
>
> ef6035d2f1f4 ("dt-bindings: regulator: qcom,usb-vbus-regulator: add support for PMI632")
>
> 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
> index 8afb40c67af3,66dcd5ce03e6..000000000000
> --- a/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
> +++ b/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
> @@@ -24,8 -24,7 +24,9 @@@ properties
> - qcom,pm8150b-vbus-reg
> - items:
> - enum:
> + - qcom,pm4125-vbus-reg
> + - qcom,pm6150-vbus-reg
> + - qcom,pmi632-vbus-reg
> - const: qcom,pm8150b-vbus-reg
>
> reg:


Looks good, thanks!