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 [off-list ref]
 +M:	Clark Wang [off-list ref]
 +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 [off-list ref]
+ 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 [off-list ref]
  S:	Maintained