Subject: Re: linux-next: manual merge of the net-next tree with the reset tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 30 May 2025 11:03:07 +1000

Hi all,

On Tue, 6 May 2025 11:25:54 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> 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.
> 
> 
> 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 <[email-masked]>
> + L:	[email-masked]
> + L:	[email-masked]
> + 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 <[email-masked]>
>  +M:	Lad Prabhakar <[email-masked]>
>  +L:	[email-masked]
>  +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 <[email-masked]>
>   L:	[email-masked]

This is now a conflict between the arm-soc tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell