linux-kernel - linux-next: manual merge of the pinctrl tree with Linus Torvalds' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20251204160455.05a4f7f4@canb.auug.org.au>
Date: Thu, 4 Dec 2025 16:04:55 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Linus Walleij <linus.walleij@...aro.org>
Cc: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>, Bartosz
 Golaszewski <brgl@...nel.org>, Linus Walleij <linusw@...nel.org>, Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the pinctrl tree with Linus Torvalds'
 tree

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@...aro.org>
+ M:	Linus Walleij <linusw@...nel.org>
 -M:	Bartosz Golaszewski <brgl@...ev.pl>
 +M:	Bartosz Golaszewski <brgl@...nel.org>
  L:	linux-gpio@...r.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@....com>
 +L:	linux-iio@...r.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@...aro.org>
+ M:	Linus Walleij <linusw@...nel.org>
  L:	linux-iio@...r.kernel.org
  S:	Maintained
  F:	Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.yaml

Content of type "application/pgp-signature" skipped