linux-next: manual merge of the pinctrl tree with the net-next tree

Posted by Stephen Rothwell 2 weeks, 2 days ago

Hi all,

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

  MAINTAINERS

between commits:

  f920ce04c399 ("dt-bindings: net: Add T-HEAD dwmac support")
  33a1a01e3afa ("net: stmmac: Add glue layer for T-HEAD TH1520 SoC")

from the net-next tree and commits:

  137ca342ae2d ("dt-bindings: pinctrl: Add thead,th1520-pinctrl bindings")
  bed5cd6f8a98 ("pinctrl: Add driver for the T-Head TH1520 SoC")

from the pinctrl 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 730c67f26c96,ff99fb6ad20c..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -20095,10 -19817,10 +20102,12 @@@ L:	linux-riscv@lists.infradead.or
  S:	Maintained
  T:	git https://github.com/pdp7/linux.git
  F:	Documentation/devicetree/bindings/clock/thead,th1520-clk-ap.yaml
 +F:	Documentation/devicetree/bindings/net/thead,th1520-gmac.yaml
+ F:	Documentation/devicetree/bindings/pinctrl/thead,th1520-pinctrl.yaml
  F:	arch/riscv/boot/dts/thead/
  F:	drivers/clk/thead/clk-th1520-ap.c
 +F:	drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c
+ F:	drivers/pinctrl/pinctrl-th1520.c
  F:	include/dt-bindings/clock/thead,th1520-clk-ap.h
  
  RNBD BLOCK DRIVERS

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

Posted by Linus Walleij 2 weeks, 2 days ago

On Thu, Nov 7, 2024 at 11:43 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the pinctrl tree got a conflict in:
>
>   MAINTAINERS

Thanks Stephen, looks trivial enough but will try to remember to mention
this to Torvalds.

Yours,
Linus Walleij

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

Posted by Drew Fustini 2 weeks, 1 day ago

On Thu, Nov 07, 2024 at 02:59:25PM +0100, Linus Walleij wrote:
> On Thu, Nov 7, 2024 at 11:43 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Today's linux-next merge of the pinctrl tree got a conflict in:
> >
> >   MAINTAINERS
> 
> Thanks Stephen, looks trivial enough but will try to remember to mention
> this to Torvalds.
> 
> Yours,
> Linus Walleij

Thank you for handling this conflict.

Drew