From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnd Bergmann <arnd@arndb•de>
Cc: David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
Philipp Zabel <p.zabel@pengutronix•de>,
Lad Prabhakar <prabhakar.mahadev-lad.rj@bp•renesas.com>,
Networking <netdev@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
ARM <linux-arm-kernel@lists•infradead.org>
Subject: Re: linux-next: manual merge of the net-next tree with the reset tree
Date: Fri, 30 May 2025 11:03:07 +1000 [thread overview]
Message-ID: <20250530110307.1eb48635@canb.auug.org.au> (raw)
In-Reply-To: <20250506112554.3832cd40@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2107 bytes --]
Hi all,
On Tue, 6 May 2025 11:25:54 +1000 Stephen Rothwell <sfr@canb•auug.org.au> 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 <prabhakar.mahadev-lad.rj@bp•renesas.com>
> + L: netdev@vger•kernel.org
> + L: linux-renesas-soc@vger•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@renesas•com>
> +M: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp•renesas.com>
> +L: linux-renesas-soc@vger•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@renesas•com>
> L: linux-i2c@vger•kernel.org
This is now a conflict between the arm-soc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-05-30 1:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-06 1:25 linux-next: manual merge of the net-next tree with the reset tree Stephen Rothwell
2025-05-30 1:03 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-01 1:25 Stephen Rothwell
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=20250530110307.1eb48635@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=davem@davemloft$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=p.zabel@pengutronix$(echo .)de \
--cc=pabeni@redhat$(echo .)com \
--cc=prabhakar.mahadev-lad.rj@bp$(echo .)renesas.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