linux-next: manual merge of the phy-next tree with the qcom tree

linux-next: manual merge of the phy-next tree with the qcom tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1497 bytes --]

Hi all,

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

  Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt

between commit:

  369b89366a3d ("dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy")

from the qcom tree and commit:

  2815588ea64b ("dt-bindings: phy-qcom-qmp: Add qcom,msm8998-qmp-pcie-phy")

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-phy.txt
index d882e40c3bd9,5fca57b12534..000000000000
--- a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
+++ b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
@@@ -69,8 -73,9 +73,10 @@@ Required properties
  			"phy", "common".
  		For "qcom,msm8998-qmp-usb3-phy" must contain
  			"phy", "common".
 -		For "qcom,msm8998-qmp-ufs-phy": no resets are listed.
 +		For "qcom,msm8998-qmp-ufs-phy": must contain:
 +			"ufsphy".
+ 		For "qcom,msm8998-qmp-pcie-phy" must contain:
+ 			"phy", "common".
  		For "qcom,sdm845-qmp-usb3-phy" must contain:
  			"phy", "common".
  		For "qcom,sdm845-qmp-usb3-uni-phy" must contain:

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the phy-next tree with the qcom tree

[Marc Gonzalez]

On 18/04/2019 07:29, Stephen Rothwell wrote:

> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
> 
> between commit:
> 
>   369b89366a3d ("dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy")
> 
> from the qcom tree and commit:
> 
>   2815588ea64b ("dt-bindings: phy-qcom-qmp: Add qcom,msm8998-qmp-pcie-phy")
> 
> 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.

Hello Stephen,

The current state of Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
is indeed:

		For "qcom,msm8998-qmp-usb3-phy" must contain
			"phy", "common".
		For "qcom,msm8998-qmp-ufs-phy": must contain:
			"ufsphy".
		For "qcom,msm8998-qmp-pcie-phy" must contain:
			"phy", "common".
		For "qcom,sdm845-qmp-usb3-phy" must contain:
			"phy", "common".


It is not clear to me what I could/should have done differently to avoid
the conflict?

Regards.

Re: linux-next: manual merge of the phy-next tree with the qcom tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

Hi Marc,

On Thu, 18 Apr 2019 09:35:44 +0200 Marc Gonzalez <marc.w.gonzalez@free.fr> wrote:
>
> It is not clear to me what I could/should have done differently to avoid
> the conflict?

Nothing really, it will need to be fixed up when these trees are merged
into Linus' tree (or some other tree along the way).  It is not a big
problem as the conflict is pretty simple.  I send the emails just so
people can see what I think the resolution should be and correct me if
I am mistaken.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the phy-next tree with the qcom tree

[Andy Gross]

On Thu, Apr 18, 2019 at 09:35:44AM +0200, Marc Gonzalez wrote:
> 
> It is not clear to me what I could/should have done differently to avoid
> the conflict?

I dropped the patch for now.  We can deal with this later as it is trivial.
The best way probably would have been for Kishon to take this patch as well.
Then he would have fixed it up and no one else would have seen it.  But we'll
deal with it in a few weeks.  No biggie.


Andy

Re: linux-next: manual merge of the phy-next tree with the qcom tree

[Kishon Vijay Abraham I]

On 19/04/19 10:28 AM, Andy Gross wrote:
> On Thu, Apr 18, 2019 at 09:35:44AM +0200, Marc Gonzalez wrote:
>>
>> It is not clear to me what I could/should have done differently to avoid
>> the conflict?
> 
> I dropped the patch for now.  We can deal with this later as it is trivial.
> The best way probably would have been for Kishon to take this patch as well.
> Then he would have fixed it up and no one else would have seen it.  But we'll
> deal with it in a few weeks.  No biggie.

I've included "dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy" in
linux-phy tree now.

Thanks
Kishon

Re: linux-next: manual merge of the phy-next tree with the qcom tree

[Marc Gonzalez]

On 22/04/2019 13:47, Kishon Vijay Abraham I wrote:

> On 19/04/19 10:28 AM, Andy Gross wrote:
> 
>> On Thu, Apr 18, 2019 at 09:35:44AM +0200, Marc Gonzalez wrote:
>>>
>>> It is not clear to me what I could/should have done differently to avoid
>>> the conflict?
>>
>> I dropped the patch for now.  We can deal with this later as it is trivial.
>> The best way probably would have been for Kishon to take this patch as well.
>> Then he would have fixed it up and no one else would have seen it.  But we'll
>> deal with it in a few weeks.  No biggie.
> 
> I've included "dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy" in
> linux-phy tree now.

Thanks Kishon,

Great news. That's one less patch to keep track of.

Regards.

Re: linux-next: manual merge of the phy-next tree with the qcom tree

[Andy Gross]

On Tue, Apr 23, 2019 at 11:13:59AM +0200, Marc Gonzalez wrote:
> > I've included "dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy" in
> > linux-phy tree now.
> 
> Thanks Kishon,
> 
> Great news. That's one less patch to keep track of.

Thanks Kishon!

Andy

linux-next: manual merge of the phy-next tree with the qcom tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1746 bytes --]

Hi all,

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

  Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt

between commit:

  c04421c68fd4 ("dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible")

from the qcom tree and commit:

  e7393b60a14f ("dt-bindings: phy: convert Qualcomm USB HS phy to yaml")

from the phy-next tree.

I fixed it up (I removed the file and added the following merge fix patch)
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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jan 2022 12:24:35 +1100
Subject: [PATCH] merge fix for "dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
index a60386bd19b2..e23e5590eaa3 100644
--- a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
@@ -38,6 +38,7 @@ properties:
     items:
       - enum:
           - qcom,usb-hs-phy-apq8064
+          - qcom,usb-hs-phy-msm8226
           - qcom,usb-hs-phy-msm8916
           - qcom,usb-hs-phy-msm8974
       - const: qcom,usb-hs-phy
-- 
2.34.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]