> 's linux-next merge of the i2c tree got a conflict in:
> 
>   Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml
> 
> between commit:
> 
>   804ebc2bdcc85 ("dt-bindings: i2c: nvidia,tegra20-i2c: Document Tegra264 I2C")
> 
> from the arm-soc tree and commit:

? Usually such patches go via I2C? And v6 was still under discussion? Do
i miss something?