From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@chromium.org>,
David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>,
Alexey Dobriyan <adobriyan@gmail.com>,
FUJITA Tomonori <fujita.tomonori@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Trevor Gross <tmgross@umich.edu>
Subject: linux-next: manual merge of the execve tree with the net-next tree
Date: Mon, 18 Dec 2023 16:17:04 +1100 [thread overview]
Message-ID: <20231218161704.05c25766@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1361 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2023-12-18 5:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231218161704.05c25766@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=adobriyan@gmail.com \
--cc=davem@davemloft.net \
--cc=fujita.tomonori@gmail.com \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=tmgross@umich.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).