Re: linux-next: manual merge of the i2c-host tree with the arm-soc tree

[Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>]

On 22/05/2025 04:17, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the i2c-host tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   47cbd5d8693d ("ARM: vt8500: MAINTAINERS: Include vt8500 soc driver in maintainers entry")
> 
> from the arm-soc tree and commit:
> 
>   3887d3f64260 ("dt-bindings: i2c: i2c-wmt: Convert to YAML")
> 
> from the i2c-host 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.


Arnd,

I forgot to mention that in pull request. There will be a conflict in
MAINTAINERS file in ARM/VT8500 ARM ARCHITECTURE entry:

 3425 ARM/VT8500 ARM ARCHITECTURE
 3426 M:      Alexey Charkov <alchark@gmail.com> 
 3427 M:      Krzysztof Kozlowski <krzk@kernel.org>

between multiple trees - arm-soc, i2c, devicetree and pwm, because
patches went through different trees. This conflict will go to Linus as
well.

Final resolution is like:

 -F:	Documentation/devicetree/bindings/i2c/i2c-wmt.txt
 +F:	Documentation/devicetree/bindings/hwinfo/via,vt8500-scc-id.yaml
 +F:	Documentation/devicetree/bindings/i2c/wm,wm8505-i2c.yaml
 +F:	Documentation/devicetree/bindings/interrupt-controller/via,vt8500-intc.yaml
+ F:	Documentation/devicetree/bindings/pwm/via,vt8500-pwm.yaml



Best regards,
Krzysztof