linux-kernel - linux-next: manual merge of the net-next tree with the reset 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: <20250506112554.3832cd40@canb.auug.org.au>
Date: Tue, 6 May 2025 11:25:54 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>, Philipp Zabel <p.zabel@...gutronix.de>
Cc: Lad Prabhakar <prabhakar.mahadev-lad.rj@...renesas.com>, Networking
 <netdev@...r.kernel.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 net-next tree with the reset tree

Hi all,

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

  MAINTAINERS

between commit:

  57dfdfbe1a03 ("MAINTAINERS: Add entry for Renesas RZ/V2H(P) USB2PHY Port Reset driver")

from the reset tree and commit:

  326976b05543 ("MAINTAINERS: Add entry for Renesas RZ/V2H(P) DWMAC GBETH glue layer driver")

from the net-next 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 c056bd633983,5c31814c9687..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -20827,14 -20699,14 +20829,22 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/usb/renesas,rzn1-usbf.yaml
  F:	drivers/usb/gadget/udc/renesas_usbf.c
  
+ RENESAS RZ/V2H(P) DWMAC GBETH GLUE LAYER DRIVER
+ M:	Lad Prabhakar <prabhakar.mahadev-lad.rj@...renesas.com>
+ L:	netdev@...r.kernel.org
+ L:	linux-renesas-soc@...r.kernel.org
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/net/renesas,r9a09g057-gbeth.yaml
+ F:	drivers/net/ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c
+ 
 +RENESAS RZ/V2H(P) USB2PHY PORT RESET DRIVER
 +M:	Fabrizio Castro <fabrizio.castro.jz@...esas.com>
 +M:	Lad Prabhakar <prabhakar.mahadev-lad.rj@...renesas.com>
 +L:	linux-renesas-soc@...r.kernel.org
 +S:	Supported
 +F:	Documentation/devicetree/bindings/reset/renesas,rzv2h-usb2phy-reset.yaml
 +F:	drivers/reset/reset-rzv2h-usb2phy.c
 +
  RENESAS RZ/V2M I2C DRIVER
  M:	Fabrizio Castro <fabrizio.castro.jz@...esas.com>
  L:	linux-i2c@...r.kernel.org

Content of type "application/pgp-signature" skipped