linux-kernel - linux-next: manual merge of the gpio-brgl tree with the mfd 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: <aNEedsR5CDuVBoyo@finisterre.sirena.org.uk>
Date: Mon, 22 Sep 2025 11:01:26 +0100
From: Mark Brown <broonie@...nel.org>
To: Bartosz Golaszewski <brgl@...ev.pl>
Cc: Lee Jones <lee@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Ming Yu <a0282524688@...il.com>
Subject: linux-next: manual merge of the gpio-brgl tree with the mfd tree

Hi all,

Today's linux-next merge of the gpio-brgl tree got a conflict in:

  MAINTAINERS

between commit:

  8c13787893fde ("mfd: Add core driver for Nuvoton NCT6694")

from the mfd tree and commits:

  51dad33ede636 ("mfd: Add core driver for Nuvoton NCT6694")
  611a995e8ae1a ("gpio: Add Nuvoton NCT6694 GPIO support")
  197e779d29d87 ("hwmon: Add Nuvoton NCT6694 HWMON support")
  c5cf27dbaeb6e ("i2c: Add Nuvoton NCT6694 I2C support")
  8a204684d0ffd ("can: Add Nuvoton NCT6694 CANFD support")
  d463bb1405836 ("rtc: Add Nuvoton NCT6694 RTC support")
  f9d737a7d84ff ("watchdog: Add Nuvoton NCT6694 WDT support")

from the gpio-brgl 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.


diff --cc MAINTAINERS
index 55288f2ffb6b3,681fbc8258052..0000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)