* linux-next: manual merge of the i2c-host tree with the arm-soc tree
@ 2025-05-22 2:17 Stephen Rothwell
2025-05-22 6:15 ` Krzysztof Kozlowski
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-05-22 2:17 UTC (permalink / raw)
To: Andi Shyti, Arnd Bergmann
Cc: Alexey Charkov, Andi Shyti, Krzysztof Kozlowski, ARM,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1353 bytes --]
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.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index 3ca100bf2c02,bc13b87e85c0..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3435,8 -3434,7 +3435,8 @@@ M: Alexey Charkov <alchark@gmail•com
M: Krzysztof Kozlowski <krzk@kernel•org>
L: linux-arm-kernel@lists•infradead.org (moderated for non-subscribers)
S: Odd Fixes
+F: Documentation/devicetree/bindings/hwinfo/via,vt8500-scc-id.yaml
- F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt
+ F: Documentation/devicetree/bindings/i2c/wm,wm8505-i2c.yaml
F: arch/arm/boot/dts/vt8500/
F: arch/arm/mach-vt8500/
F: drivers/clocksource/timer-vt8500.c
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the i2c-host tree with the arm-soc tree
2025-05-22 2:17 linux-next: manual merge of the i2c-host tree with the arm-soc tree Stephen Rothwell
@ 2025-05-22 6:15 ` Krzysztof Kozlowski
0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Kozlowski @ 2025-05-22 6:15 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexey Charkov, Andi Shyti, ARM, Linux Kernel Mailing List,
Linux Next Mailing List, Andi Shyti, Stephen Rothwell
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-05-22 6:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-22 2:17 linux-next: manual merge of the i2c-host tree with the arm-soc tree Stephen Rothwell
2025-05-22 6:15 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox