* linux-next: manual merge of the phy-next tree with the usb tree
@ 2021-08-09 7:10 Stephen Rothwell
2021-08-09 7:39 ` Greg KH
2021-08-27 6:58 ` Stephen Rothwell
0 siblings, 2 replies; 7+ messages in thread
From: Stephen Rothwell @ 2021-08-09 7:10 UTC (permalink / raw)
To: Kishon Vijay Abraham I, Vinod Koul, Greg KH
Cc: Bjorn Andersson, Linux Kernel Mailing List,
Linux Next Mailing List, Sandeep Maheswaram
[-- Attachment #1: Type: text/plain, Size: 1339 bytes --]
Hi all,
Today's linux-next merge of the phy-next tree got a conflict in:
Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
between commit:
e516ac5d48fe ("dt-bindings: phy: qcom,qmp-usb3-dp: Add support for SC7280")
from the usb tree and commit:
1a00d130596f ("dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x")
from the phy-next 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/phy/qcom,qmp-usb3-dp-phy.yaml
index 20199833f144,1d49cc3d4eae..000000000000
--- a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
@@@ -14,7 -14,7 +14,8 @@@ properties
compatible:
enum:
- qcom,sc7180-qmp-usb3-dp-phy
+ - qcom,sc7280-qmp-usb3-dp-phy
+ - qcom,sc8180x-qmp-usb3-dp-phy
- qcom,sdm845-qmp-usb3-dp-phy
- qcom,sm8250-qmp-usb3-dp-phy
reg:
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the phy-next tree with the usb tree
2021-08-09 7:10 linux-next: manual merge of the phy-next tree with the usb tree Stephen Rothwell
@ 2021-08-09 7:39 ` Greg KH
2021-08-27 6:58 ` Stephen Rothwell
1 sibling, 0 replies; 7+ messages in thread
From: Greg KH @ 2021-08-09 7:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Kishon Vijay Abraham I, Vinod Koul, Bjorn Andersson,
Linux Kernel Mailing List, Linux Next Mailing List,
Sandeep Maheswaram
On Mon, Aug 09, 2021 at 05:10:23PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the phy-next tree got a conflict in:
>
> Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
>
> between commit:
>
> e516ac5d48fe ("dt-bindings: phy: qcom,qmp-usb3-dp: Add support for SC7280")
>
> from the usb tree and commit:
>
> 1a00d130596f ("dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x")
>
> from the phy-next 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/phy/qcom,qmp-usb3-dp-phy.yaml
> index 20199833f144,1d49cc3d4eae..000000000000
> --- a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> @@@ -14,7 -14,7 +14,8 @@@ properties
> compatible:
> enum:
> - qcom,sc7180-qmp-usb3-dp-phy
> + - qcom,sc7280-qmp-usb3-dp-phy
> + - qcom,sc8180x-qmp-usb3-dp-phy
> - qcom,sdm845-qmp-usb3-dp-phy
> - qcom,sm8250-qmp-usb3-dp-phy
> reg:
Looks good, thanks!
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the phy-next tree with the usb tree
2021-08-09 7:10 linux-next: manual merge of the phy-next tree with the usb tree Stephen Rothwell
2021-08-09 7:39 ` Greg KH
@ 2021-08-27 6:58 ` Stephen Rothwell
2021-08-27 8:20 ` Greg KH
1 sibling, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2021-08-27 6:58 UTC (permalink / raw)
To: Vinod Koul, Greg KH
Cc: Kishon Vijay Abraham I, Bjorn Andersson,
Linux Kernel Mailing List, Linux Next Mailing List,
Sandeep Maheswaram
[-- Attachment #1: Type: text/plain, Size: 1176 bytes --]
Hi all,
On Mon, 9 Aug 2021 17:10:23 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the phy-next tree got a conflict in:
>
> Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
>
> between commit:
>
> e516ac5d48fe ("dt-bindings: phy: qcom,qmp-usb3-dp: Add support for SC7280")
>
> from the usb tree and commit:
>
> 1a00d130596f ("dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x")
>
> from the phy-next tree.
>
>
> diff --cc Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> index 20199833f144,1d49cc3d4eae..000000000000
> --- a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> @@@ -14,7 -14,7 +14,8 @@@ properties
> compatible:
> enum:
> - qcom,sc7180-qmp-usb3-dp-phy
> + - qcom,sc7280-qmp-usb3-dp-phy
> + - qcom,sc8180x-qmp-usb3-dp-phy
> - qcom,sdm845-qmp-usb3-dp-phy
> - qcom,sm8250-qmp-usb3-dp-phy
> reg:
This is now a conflict between the char-misc tree and the usb tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the phy-next tree with the usb tree
2021-08-27 6:58 ` Stephen Rothwell
@ 2021-08-27 8:20 ` Greg KH
0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2021-08-27 8:20 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Vinod Koul, Kishon Vijay Abraham I, Bjorn Andersson,
Linux Kernel Mailing List, Linux Next Mailing List,
Sandeep Maheswaram
On Fri, Aug 27, 2021 at 04:58:22PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 9 Aug 2021 17:10:23 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the phy-next tree got a conflict in:
> >
> > Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> >
> > between commit:
> >
> > e516ac5d48fe ("dt-bindings: phy: qcom,qmp-usb3-dp: Add support for SC7280")
> >
> > from the usb tree and commit:
> >
> > 1a00d130596f ("dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x")
> >
> > from the phy-next tree.
> >
> >
> > diff --cc Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> > index 20199833f144,1d49cc3d4eae..000000000000
> > --- a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> > +++ b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> > @@@ -14,7 -14,7 +14,8 @@@ properties
> > compatible:
> > enum:
> > - qcom,sc7180-qmp-usb3-dp-phy
> > + - qcom,sc7280-qmp-usb3-dp-phy
> > + - qcom,sc8180x-qmp-usb3-dp-phy
> > - qcom,sdm845-qmp-usb3-dp-phy
> > - qcom,sm8250-qmp-usb3-dp-phy
> > reg:
>
> This is now a conflict between the char-misc tree and the usb tree.
Resolution looks good to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the phy-next tree with the usb tree
2023-10-04 2:00 Stephen Rothwell
@ 2023-10-04 6:39 ` Greg KH
0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2023-10-04 6:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Kishon Vijay Abraham I, Vinod Koul, Dmitry Baryshkov,
Linux Kernel Mailing List, Linux Next Mailing List,
Rohit Agarwal
On Wed, Oct 04, 2023 at 01:00:34PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the phy-next tree got a conflict in:
>
> Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
>
> between commit:
>
> df55d4f814f9 ("dt-bindings: phy: qcom,qmp-usb: Add SDX75 USB3 PHY")
>
> from the usb tree and commit:
>
> 15c83637402c ("dt-bindings: phy: migrate QMP USB PHY bindings to qcom,sc8280xp-qmp-usb3-uni-phy.yaml")
>
> from the phy-next 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/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
> index d58dd744d5d2,bbdb28cd8029..000000000000
> --- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
> @@@ -20,8 -24,14 +24,15 @@@ properties
> - qcom,qcm2290-qmp-usb3-phy
> - qcom,sa8775p-qmp-usb3-uni-phy
> - qcom,sc8280xp-qmp-usb3-uni-phy
> + - qcom,sdm845-qmp-usb3-uni-phy
> + - qcom,sdx55-qmp-usb3-uni-phy
> + - qcom,sdx65-qmp-usb3-uni-phy
> + - qcom,sdx75-qmp-usb3-uni-phy
> - qcom,sm6115-qmp-usb3-phy
> + - qcom,sm8150-qmp-usb3-uni-phy
> + - qcom,sm8250-qmp-usb3-uni-phy
> + - qcom,sm8350-qmp-usb3-uni-phy
> +
>
> reg:
> maxItems: 1
> @@@ -75,10 -87,17 +88,18 @@@ allOf
> compatible:
> contains:
> enum:
> + - qcom,ipq6018-qmp-usb3-phy
> + - qcom,ipq8074-qmp-usb3-phy
> - qcom,ipq9574-qmp-usb3-phy
> + - qcom,msm8996-qmp-usb3-phy
> + - qcom,msm8998-qmp-usb3-phy
> + - qcom,sdx55-qmp-usb3-uni-phy
> + - qcom,sdx65-qmp-usb3-uni-phy
> + - qcom,sdx75-qmp-usb3-uni-phy
> then:
> properties:
> + clocks:
> + maxItems: 4
> clock-names:
> items:
> - const: aux
Looks good to me, thanks!
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: manual merge of the phy-next tree with the usb tree
@ 2023-10-04 2:00 Stephen Rothwell
2023-10-04 6:39 ` Greg KH
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2023-10-04 2:00 UTC (permalink / raw)
To: Kishon Vijay Abraham I, Vinod Koul, Greg KH
Cc: Dmitry Baryshkov, Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Rohit Agarwal
[-- Attachment #1: Type: text/plain, Size: 2252 bytes --]
Hi all,
Today's linux-next merge of the phy-next tree got a conflict in:
Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
between commit:
df55d4f814f9 ("dt-bindings: phy: qcom,qmp-usb: Add SDX75 USB3 PHY")
from the usb tree and commit:
15c83637402c ("dt-bindings: phy: migrate QMP USB PHY bindings to qcom,sc8280xp-qmp-usb3-uni-phy.yaml")
from the phy-next 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/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
index d58dd744d5d2,bbdb28cd8029..000000000000
--- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
@@@ -20,8 -24,14 +24,15 @@@ properties
- qcom,qcm2290-qmp-usb3-phy
- qcom,sa8775p-qmp-usb3-uni-phy
- qcom,sc8280xp-qmp-usb3-uni-phy
+ - qcom,sdm845-qmp-usb3-uni-phy
+ - qcom,sdx55-qmp-usb3-uni-phy
+ - qcom,sdx65-qmp-usb3-uni-phy
+ - qcom,sdx75-qmp-usb3-uni-phy
- qcom,sm6115-qmp-usb3-phy
+ - qcom,sm8150-qmp-usb3-uni-phy
+ - qcom,sm8250-qmp-usb3-uni-phy
+ - qcom,sm8350-qmp-usb3-uni-phy
+
reg:
maxItems: 1
@@@ -75,10 -87,17 +88,18 @@@ allOf
compatible:
contains:
enum:
+ - qcom,ipq6018-qmp-usb3-phy
+ - qcom,ipq8074-qmp-usb3-phy
- qcom,ipq9574-qmp-usb3-phy
+ - qcom,msm8996-qmp-usb3-phy
+ - qcom,msm8998-qmp-usb3-phy
+ - qcom,sdx55-qmp-usb3-uni-phy
+ - qcom,sdx65-qmp-usb3-uni-phy
+ - qcom,sdx75-qmp-usb3-uni-phy
then:
properties:
+ clocks:
+ maxItems: 4
clock-names:
items:
- const: aux
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: manual merge of the phy-next tree with the usb tree
@ 2020-01-07 3:24 Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2020-01-07 3:24 UTC (permalink / raw)
To: Kishon Vijay Abraham I, Greg KH
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Krzysztof Kozlowski
[-- Attachment #1: Type: text/plain, Size: 838 bytes --]
Hi all,
Today's linux-next merge of the phy-next tree got a conflict in:
drivers/phy/mediatek/Kconfig
between commit:
203b7ee14d3a ("phy: Enable compile testing for some of drivers")
from the usb tree and commits:
6ee054e3a2e9 ("phy: mediatek: Fix Kconfig indentation")
1544133d48c3 ("phy: Enable compile testing for some of drivers")
from the phy-next tree.
I fixed it up (I just used the latter version of the file) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-10-04 6:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-09 7:10 linux-next: manual merge of the phy-next tree with the usb tree Stephen Rothwell
2021-08-09 7:39 ` Greg KH
2021-08-27 6:58 ` Stephen Rothwell
2021-08-27 8:20 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2023-10-04 2:00 Stephen Rothwell
2023-10-04 6:39 ` Greg KH
2020-01-07 3:24 Stephen Rothwell
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).