From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>,
David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>
Cc: Networking <netdev@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Wei Fang <wei.fang@nxp•com>,
Woodrow Douglass <wdouglass@carnegierobotics•com>
Subject: linux-next: manual merge of the regulator tree with the net-next tree
Date: Mon, 8 Sep 2025 15:43:20 +1000 [thread overview]
Message-ID: <20250908154320.2ec4138b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1644 bytes --]
Hi all,
Today's linux-next merge of the regulator tree got a conflict in:
MAINTAINERS
between commit:
dc331726469d ("MAINTAINERS: add NETC Timer PTP clock driver section")
from the net-next tree and commit:
b497e1a1a2b1 ("regulator: pf530x: Add a driver for the NXP PF5300 Regulator")
from the regulator 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 28249f3e8dba,b4fc45b008ed..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -18386,15 -18291,12 +18386,21 @@@ F: Documentation/devicetree/bindings/cl
F: drivers/clk/imx/
F: include/dt-bindings/clock/*imx*
+NXP NETC TIMER PTP CLOCK DRIVER
+M: Wei Fang <wei.fang@nxp•com>
+M: Clark Wang <xiaoning.wang@nxp•com>
+L: imx@lists•linux.dev
+L: netdev@vger•kernel.org
+S: Maintained
+F: Documentation/devicetree/bindings/ptp/nxp,ptp-netc.yaml
+F: drivers/ptp/ptp_netc.c
+
+ NXP PF5300/PF5301/PF5302 PMIC REGULATOR DEVICE DRIVER
+ M: Woodrow Douglass <wdouglass@carnegierobotics•com>
+ S: Maintained
+ F: Documentation/devicetree/bindings/regulator/nxp,pf5300.yaml
+ F: drivers/regulator/pf530x-regulator.c
+
NXP PF8100/PF8121A/PF8200 PMIC REGULATOR DEVICE DRIVER
M: Jagan Teki <jagan@amarulasolutions•com>
S: Maintained
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2025-09-08 5:43 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=20250908154320.2ec4138b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=wdouglass@carnegierobotics$(echo .)com \
--cc=wei.fang@nxp$(echo .)com \
/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