* linux-next: manual merge of the usb tree with the regulator tree
@ 2024-02-20 3:31 Stephen Rothwell
2024-02-20 8:18 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2024-02-20 3:31 UTC (permalink / raw)
To: Greg KH, Mark Brown, Liam Girdwood
Cc: Danila Tikhonov, Dmitry Baryshkov, Greg Kroah-Hartman,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1409 bytes --]
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 commit:
ec29a4d9b7c7 ("dt-bindings: regulator: qcom,usb-vbus-regulator: Add PM6150 compatible")
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 (I have no idea if this is correct - 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 bf6336850be6,66dcd5ce03e6..000000000000
--- a/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
@@@ -24,7 -24,7 +24,8 @@@ properties
- qcom,pm8150b-vbus-reg
- items:
- enum:
+ - qcom,pm6150-vbus-reg
+ - qcom,pmi632-vbus-reg
- const: qcom,pm8150b-vbus-reg
reg:
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the usb tree with the regulator tree
2024-02-20 3:31 linux-next: manual merge of the usb tree with the regulator tree Stephen Rothwell
@ 2024-02-20 8:18 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2024-02-20 8:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Liam Girdwood, Danila Tikhonov, Dmitry Baryshkov,
Linux Kernel Mailing List, Linux Next Mailing List
On Tue, Feb 20, 2024 at 02:31:42PM +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 commit:
>
> ec29a4d9b7c7 ("dt-bindings: regulator: qcom,usb-vbus-regulator: Add PM6150 compatible")
>
> 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 (I have no idea if this is correct - 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 correct, thanks!
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the usb tree with the regulator tree
2024-02-22 4:38 Stephen Rothwell
@ 2024-02-22 7:42 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2024-02-22 7:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Liam Girdwood, Danila Tikhonov, Dmitry Baryshkov,
Linux Kernel Mailing List, Linux Next Mailing List
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!
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the usb tree with the regulator tree
@ 2024-02-22 4:38 Stephen Rothwell
2024-02-22 7:42 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2024-02-22 4:38 UTC (permalink / raw)
To: Greg KH, Mark Brown, Liam Girdwood
Cc: Danila Tikhonov, Dmitry Baryshkov, Greg Kroah-Hartman,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1506 bytes --]
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:
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-22 7:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-20 3:31 linux-next: manual merge of the usb tree with the regulator tree Stephen Rothwell
2024-02-20 8:18 ` Greg KH
2024-02-22 4:38 Stephen Rothwell
2024-02-22 7:42 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).