* linux-next: manual merge of the net-next tree with the reset tree
@ 2024-11-01 1:25 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2024-11-01 1:25 UTC (permalink / raw)
To: David Miller, Jakub Kicinski, Paolo Abeni, Philipp Zabel
Cc: Daniel Machon, Herve Codina, Networking,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1518 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
MAINTAINERS
between commit:
86f134941a4b ("MAINTAINERS: Add the Microchip LAN966x PCI driver entry")
from the reset tree and commit:
7280f01e79cc ("net: lan969x: add match data for lan969x")
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 a0cad73c28d0,c4027397286b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -15179,12 -15091,13 +15185,19 @@@ S: Maintaine
F: Documentation/devicetree/bindings/interrupt-controller/microchip,lan966x-oic.yaml
F: drivers/irqchip/irq-lan966x-oic.c
+MICROCHIP LAN966X PCI DRIVER
+M: Herve Codina <herve.codina@bootlin.com>
+S: Maintained
+F: drivers/misc/lan966x_pci.c
+F: drivers/misc/lan966x_pci.dtso
+
+ MICROCHIP LAN969X ETHERNET DRIVER
+ M: Daniel Machon <daniel.machon@microchip.com>
+ M: UNGLinuxDriver@microchip.com
+ L: netdev@vger.kernel.org
+ S: Maintained
+ F: drivers/net/ethernet/microchip/lan969x/*
+
MICROCHIP LCDFB DRIVER
M: Nicolas Ferre <nicolas.ferre@microchip.com>
L: linux-fbdev@vger.kernel.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the net-next tree with the reset tree
@ 2025-05-06 1:25 Stephen Rothwell
2025-05-30 1:03 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2025-05-06 1:25 UTC (permalink / raw)
To: David Miller, Jakub Kicinski, Paolo Abeni, Philipp Zabel
Cc: Lad Prabhakar, Networking, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1854 bytes --]
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@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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the net-next tree with the reset tree
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
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-05-30 1:03 UTC (permalink / raw)
To: Arnd Bergmann
Cc: David Miller, Jakub Kicinski, Paolo Abeni, Philipp Zabel,
Lad Prabhakar, Networking, Linux Kernel Mailing List,
Linux Next Mailing List, ARM
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-30 1:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
-- strict thread matches above, loose matches on Subject: below --
2024-11-01 1:25 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox