linux-next: manual merge of the phy-next tree with the v4l-dvb tree

linux-next: manual merge of the phy-next tree with the v4l-dvb tree

[Mark Brown]

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

Hi all,

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

  Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml

between commits:

  42b96f94929c9 ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
  a93b9de71466f ("dt-bindings: phy: qcom,x1e80100-csi2-phy: Add Glymur compatible")

from the v4l-dvb tree and commit:

  3b0140f37d25b ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")

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.

diff --combined Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml
index 1f1e2a4993b2a,dc64af97da6c6..0000000000000
--- a/Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml
@@@ -16,11 -16,7 +16,11 @@@ description
  
  properties:
    compatible:
 -    const: qcom,x1e80100-csi2-phy
 +    oneOf:
 +      - const: qcom,x1e80100-csi2-phy
 +      - items:
 +          - const: qcom,glymur-csi2-phy
 +          - const: qcom,x1e80100-csi2-phy
  
    reg:
      maxItems: 1

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

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

[Krzysztof Kozlowski]

On 01/10/2026 16:37, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml
> 
> between commits:
> 
>   42b96f94929c9 ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
>   a93b9de71466f ("dt-bindings: phy: qcom,x1e80100-csi2-phy: Add Glymur compatible")
> 
> from the v4l-dvb tree and commit:

Why were these taken via v4l/media tree?

> 
>   3b0140f37d25b ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
> 
> from the phy-next tree.
> 


Best regards,
Krzysztof

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

[Vinod Koul]

On 02-10-26, 07:33, Krzysztof Kozlowski wrote:
> On 01/10/2026 16:37, Mark Brown wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the phy-next tree got a conflict in:
> > 
> >   Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml
> > 
> > between commits:
> > 
> >   42b96f94929c9 ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
> >   a93b9de71466f ("dt-bindings: phy: qcom,x1e80100-csi2-phy: Add Glymur compatible")
> > 
> > from the v4l-dvb tree and commit:
> 
> Why were these taken via v4l/media tree?

This is even worse. Immutable branch was provided, so people can pull.
Looks like folks cherry-picked instead. They need to fix it...

> 
> > 
> >   3b0140f37d25b ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
> > 
> > from the phy-next tree.
> > 
> 
> 
> Best regards,
> Krzysztof

-- 
~Vinod

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

[Bryan O'Donoghue]

On 02/10/2026 06:33, Krzysztof Kozlowski wrote:
> On 01/10/2026 16:37, Mark Brown wrote:
>> Hi all,
>>
>> Today's linux-next merge of the phy-next tree got a conflict in:
>>
>>    Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml
>>
>> between commits:
>>
>>    42b96f94929c9 ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
>>    a93b9de71466f ("dt-bindings: phy: qcom,x1e80100-csi2-phy: Add Glymur compatible")
>>
>> from the v4l-dvb tree and commit:
> 
> Why were these taken via v4l/media tree?
> 
>>
>>    3b0140f37d25b ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
>>
>> from the phy-next tree.
>>
> 
> 
> Best regards,
> Krzysztof

That's my error.

I merged the csiphy series to linux-media because I had a dependency to 
avoid zero conflicts with linux/phy

However I inadvertendly picked up  a93b9de71466f ("dt-bindings: phy: 
qcom,x1e80100-csi2-phy: Add Glymur compatible") when picking up the 
CAMSS changes from Glymur.

b4 shazam a..c without scrubbing the b which should have gone via Vinod.

---
bod

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

[Bryan O'Donoghue]

On 02/10/2026 07:56, Vinod Koul wrote:
> On 02-10-26, 07:33, Krzysztof Kozlowski wrote:
>> On 01/10/2026 16:37, Mark Brown wrote:
>>> Hi all,
>>>
>>> Today's linux-next merge of the phy-next tree got a conflict in:
>>>
>>>    Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml
>>>
>>> between commits:
>>>
>>>    42b96f94929c9 ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
>>>    a93b9de71466f ("dt-bindings: phy: qcom,x1e80100-csi2-phy: Add Glymur compatible")
>>>
>>> from the v4l-dvb tree and commit:
>>
>> Why were these taken via v4l/media tree?
> 
> This is even worse. Immutable branch was provided, so people can pull.
> Looks like folks cherry-picked instead. They need to fix it...
> 
>>
>>>
>>>    3b0140f37d25b ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
>>>
>>> from the phy-next tree.
>>>
>>
>>
>> Best regards,
>> Krzysztof
> 
> --
> ~Vinod

Hmm I did a git merge on your provided branch.. I did a subsequent 
rebase on linux-media/next though so that rewrote the git history. I 
should have rebased, merged and then cherry-picked what was go to into 
linux-media.

That's completely my error, I forgot to isolate the merge when rebasing.

If its OK with you I'll ask Mauro to take the version version in 
linux-media ?

---
bod