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