| Message ID | 20241107214351.59b251f1@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: manual merge of the pinctrl tree with the net-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
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
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
diff --cc MAINTAINERS index 730c67f26c96,ff99fb6ad20c..000000000000 --- a/MAINTAINERS
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.