From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Linus Walleij <linus.walleij@linaro•org>
Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro•org>,
Bartosz Golaszewski <brgl@kernel•org>,
Linus Walleij <linusw@kernel•org>,
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 pinctrl tree with Linus Torvalds' tree
Date: Thu, 4 Dec 2025 16:04:55 +1100 [thread overview]
Message-ID: <20251204160455.05a4f7f4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1976 bytes --]
Hi all,
Today's linux-next merge of the pinctrl tree got a conflict in:
MAINTAINERS
between commit:
2b6d546ba83e ("MAINTAINERS: update my email address")
from Linus' tree and commit:
ac52b4a98509 ("MAINTAINERS: Change Linus Walleij mail address")
from the pinctrl 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 afc9ab97b9c6,13f61acdc8f7..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -10787,8 -10669,8 +10787,8 @@@ F: drivers/gpio/gpio-sloppy-logic-analy
F: tools/gpio/gpio-sloppy-logic-analyzer.sh
GPIO SUBSYSTEM
- M: Linus Walleij <linus.walleij@linaro•org>
+ M: Linus Walleij <linusw@kernel•org>
-M: Bartosz Golaszewski <brgl@bgdev•pl>
+M: Bartosz Golaszewski <brgl@kernel•org>
L: linux-gpio@vger•kernel.org
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@@ -13177,16 -13032,8 +13177,16 @@@ F: Documentation/ABI/testing/sysfs-bus-
F: Documentation/devicetree/bindings/iio/imu/invensense,icm42600.yaml
F: drivers/iio/imu/inv_icm42600/
+INVENSENSE ICM-456xx IMU DRIVER
+M: Remi Buisson <remi.buisson@tdk•com>
+L: linux-iio@vger•kernel.org
+S: Maintained
+W: https://invensense.tdk.com/
+F: Documentation/devicetree/bindings/iio/imu/invensense,icm45600.yaml
+F: drivers/iio/imu/inv_icm45600/
+
INVENSENSE MPU-3050 GYROSCOPE DRIVER
- M: Linus Walleij <linus.walleij@linaro•org>
+ M: Linus Walleij <linusw@kernel•org>
L: linux-iio@vger•kernel.org
S: Maintained
F: Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.yaml
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2025-12-04 5:04 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=20251204160455.05a4f7f4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bartosz.golaszewski@linaro$(echo .)org \
--cc=brgl@kernel$(echo .)org \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linusw@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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