Skip to contentSkip to conversation

dt-bindings: Revert "dt-bindings: soc: grf: add naneng combo phy register compatible"

PATCH In review Vinod Koul 3 participants 8 messages Mar 2, 2022

Subsystems (3)
lore
Share & tools
lore

Vinod Koul

author maintainer
#0 lore raw

PATCH 1/1 dt-bindings: Revert "dt-bindings: soc: grf: add naneng combo phy register compatible"

This reverts commit b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") as that was wrongly merged, so better to drop the wrong patch

---
I am applying this to phy-next to fix the issue

 Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 2 --
 1 file changed, 2 deletions(-)
Documentation/devicetree/bindings/soc/rockchip/grf.yaml +0 -2
index fe68e22efce0..dfebf425ca49 100644
@@ -38,8 +38,6 @@ properties:
               - rockchip,rk3399-grf
               - rockchip,rk3399-pmugrf
               - rockchip,rk3568-grf
-              - rockchip,rk3568-pipe-grf
-              - rockchip,rk3568-pipe-phy-grf
               - rockchip,rk3568-pmugrf
               - rockchip,rv1108-grf
               - rockchip,rv1108-pmugrf
Signature · 1 line
2.34.1
#1 lore raw
Quoted 8 lines · Vinod Koul

This reverts commit b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") as that was wrongly merged, so better to drop the wrong patch

---
I am applying this to phy-next to fix the issue

Reverting will just cause a different warning that it is undocumented. The fix in the other thread won't apply either if you revert.

Rob

#2 lore raw
Quoted 7 lines · Rob Herring
Quoted 5 lines · Vinod Koul

This reverts commit b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") as that was wrongly merged, so better to drop the wrong patch

Quoted 6 lines
Quoted 3 lines

---
I am applying this to phy-next to fix the issue

Reverting will just cause a different warning that it is undocumented. The fix in the other thread won't apply either if you revert.

Reverting and reapplying the original patch would work.
https://patchwork.kernel.org/project/linux-rockchip/patch/[email protected]/

Quoted 2 lines

Rob

Signature · 3 lines
linux-phy mailing list
[email protected]
https://lists.infradead.org/mailman/listinfo/linux-phy
author maintainer
#3 lore raw
Quoted 12 lines · Peter Geis
Quoted 11 lines · Rob Herring
Quoted 8 lines · Vinod Koul

This reverts commit b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") as that was wrongly merged, so better to drop the wrong patch

---
I am applying this to phy-next to fix the issue

Quoted 5 lines
Quoted 2 lines

Reverting will just cause a different warning that it is undocumented. The fix in the other thread won't apply either if you revert.

Reverting and reapplying the original patch would work.
https://patchwork.kernel.org/project/linux-rockchip/patch/[email protected]/

It does not apply to phy-next!

Signature · 1 line
~Vinod
author maintainer
#4 lore raw
In reply to Rob Herring
Quoted 11 lines · Rob Herring
Quoted 8 lines · Vinod Koul

This reverts commit b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") as that was wrongly merged, so better to drop the wrong patch

---
I am applying this to phy-next to fix the issue

Reverting will just cause a different warning that it is undocumented.

Right, but a patch for that would fix that

Quoted 1 line

The fix in the other thread won't apply either if you revert.

It is not applying for me, so that needs to be updated anyways..

Signature · 1 line
~Vinod
#5 lore raw
Quoted 12 lines · Vinod Koul
Quoted 10 lines · Rob Herring
Quoted 8 lines · Vinod Koul

This reverts commit b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") as that was wrongly merged, so better to drop the wrong patch

---
I am applying this to phy-next to fix the issue

Quoted 7 lines
Quoted 1 line

Reverting will just cause a different warning that it is undocumented.

Right, but a patch for that would fix that

Quoted 1 line

The fix in the other thread won't apply either if you revert.

It is not applying for me, so that needs to be updated anyways..

It seems phy-next has fallen out of sync with -next. It's missing this patch:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/Documentation/devicetree/bindings/soc/rockchip/grf.yaml?h=next-20220302&id=7dbb47d64acf4aac131a2aaade726913aa62abe7

Quoted 3 lines

--
~Vinod

#6 lore raw
Quoted 18 lines · Peter Geis
Quoted 16 lines · Vinod Koul
Quoted 11 lines · Rob Herring
Quoted 8 lines · Vinod Koul

This reverts commit b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") as that was wrongly merged, so better to drop the wrong patch

---
I am applying this to phy-next to fix the issue

Reverting will just cause a different warning that it is undocumented.

Right, but a patch for that would fix that

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

The fix in the other thread won't apply either if you revert.

It is not applying for me, so that needs to be updated anyways..

It seems phy-next has fallen out of sync with -next. It's missing this patch:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/Documentation/devicetree/bindings/soc/rockchip/grf.yaml?h=next-20220302&id=7dbb47d64acf4aac131a2aaade726913aa62abe7

That is not how things work. linux-next is a tree that no one can apply patches to (in the worst case like this one). It's useful for integration testing and a shortcut for getting a maintainer's tree, but should not be the basis for patches to the lists. You should generally use the last rc1 or a maintainer's tree when there is a known dependency. Using a stable base means 'git am -3' works and the merge tools work rather than git just failing to apply anything.

Rob

#7 lore raw
Quoted 28 lines · Rob Herring
Quoted 18 lines · Peter Geis
Quoted 16 lines · Vinod Koul
Quoted 11 lines · Rob Herring
Quoted 8 lines · Vinod Koul

This reverts commit b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") as that was wrongly merged, so better to drop the wrong patch

---
I am applying this to phy-next to fix the issue

Reverting will just cause a different warning that it is undocumented.

Right, but a patch for that would fix that

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

The fix in the other thread won't apply either if you revert.

It is not applying for me, so that needs to be updated anyways..

It seems phy-next has fallen out of sync with -next. It's missing this patch:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/Documentation/devicetree/bindings/soc/rockchip/grf.yaml?h=next-20220302&id=7dbb47d64acf4aac131a2aaade726913aa62abe7

Quoted 7 lines

That is not how things work. linux-next is a tree that no one can apply patches to (in the worst case like this one). It's useful for integration testing and a shortcut for getting a maintainer's tree, but should not be the basis for patches to the lists. You should generally use the last rc1 or a maintainer's tree when there is a known dependency. Using a stable base means 'git am -3' works and the merge tools work rather than git just failing to apply anything.

I apologize, as I'm not the progenitor of the original patch or the merge conflict I'm missing insight here.
My series is dependent on patches that were pulled in several trees and the only place they are all currently available is in -next. I attempted to correct the merge issue in my series, but I don't know how I would do so when it needs to be based on multiple trees to be correct.

I will wait until this all settles down and resubmit based on 5.18-rc1

Respectfully,
Peter

Quoted 2 lines

Rob