linux-kernel - linux-next: manual merge of the regulator tree with the net-next 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: <20250908154320.2ec4138b@canb.auug.org.au>
Date: Mon, 8 Sep 2025 15:43:20 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Mark Brown <broonie@...nel.org>, Liam Girdwood <lgirdwood@...il.com>,
 David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, Paolo
 Abeni <pabeni@...hat.com>
Cc: Networking <netdev@...r.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Wei Fang <wei.fang@....com>, Woodrow Douglass
 <wdouglass@...negierobotics.com>
Subject: linux-next: manual merge of the regulator tree with the net-next
 tree

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@....com>
 +M:	Clark Wang <xiaoning.wang@....com>
 +L:	imx@...ts.linux.dev
 +L:	netdev@...r.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@...negierobotics.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@...rulasolutions.com>
  S:	Maintained

Content of type "application/pgp-signature" skipped