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