| Message ID | 20231218161704.05c25766@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: manual merge of the execve tree with the net-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc MAINTAINERS index 1f53b4c593dd,08278b9ede48..000000000000 --- a/MAINTAINERS
Hi all, Today's linux-next merge of the execve tree got a conflict in: MAINTAINERS between commit: cbaa28f970a1 ("MAINTAINERS: add Rust PHY abstractions for ETHERNET PHY LIBRARY") from the net-next tree and commit: 0a8a952a75f2 ("ELF, MAINTAINERS: specifically mention ELF") from the execve 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.