From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Uwe Kleine-König" <ukleinek@kernel.org>,
"Rob Herring" <robh@kernel.org>,
"Andi Shyti" <andi.shyti@kernel.org>,
"Krzysztof Kozlowski" <krzk@kernel.org>
Cc: Alexey Charkov <alchark@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the pwm tree with the i2c-host, devicetree trees
Date: Fri, 9 May 2025 18:05:35 +1000 [thread overview]
Message-ID: <20250509180535.01c4c249@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1671 bytes --]
Hi all,
Today's linux-next merge of the pwm tree got a conflict in:
MAINTAINERS
between commits:
785eb0bca34b ("dt-bindings: i2c: i2c-wmt: Convert to YAML")
2b18eda58c86 ("dt-bindings: interrupt-controller: via,vt8500-intc: Convert to YAML")
47cbd5d8693d ("ARM: vt8500: MAINTAINERS: Include vt8500 soc driver in maintainers entry")
from the i2c-host, devicetree and dt-krzk trees and commit:
b6b5683e9692 ("dt-bindings: pwm: vt8500-pwm: Convert to YAML")
from the pwm 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 a7e1980b6b15,26ef29a0c9bf..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3469,9 -3427,8 +3469,10 @@@ 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/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
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 --]
reply other threads:[~2025-05-09 8:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250509180535.01c4c249@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alchark@gmail.com \
--cc=andi.shyti@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@kernel.org \
--cc=ukleinek@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®