Messages in this thread | ![/](/images/icornerl.gif) | | Date | Mon, 18 Dec 2023 16:17:04 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the execve tree with the net-next tree |
| |
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.
-- Cheers, Stephen Rothwell
diff --cc MAINTAINERS index 1f53b4c593dd,08278b9ede48..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -7919,15 -7797,7 +7919,15 @@@ F: include/uapi/linux/mdio. F: include/uapi/linux/mii.h F: net/core/of_net.c +ETHERNET PHY LIBRARY [RUST] +M: FUJITA Tomonori <fujita.tomonori@gmail.com> +R: Trevor Gross <tmgross@umich.edu> +L: netdev@vger.kernel.org +L: rust-for-linux@vger.kernel.org +S: Maintained +F: rust/kernel/net/phy.rs + - EXEC & BINFMT API + EXEC & BINFMT API, ELF R: Eric Biederman <ebiederm@xmission.com> R: Kees Cook <keescook@chromium.org> L: linux-mm@kvack.org [unhandled content-type:application/pgp-signature] | ![\](/images/icornerr.gif) |