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