From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miguel Ojeda <ojeda@kernel•org>,
David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>
Cc: Networking <netdev@vger•kernel.org>,
FUJITA Tomonori <fujita.tomonori@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Matt Gilbride <mattgilbride@google•com>,
Wedson Almeida Filho <wedsonaf@gmail•com>
Subject: linux-next: manual merge of the rust tree with the net-next tree
Date: Mon, 2 Sep 2024 16:04:36 +1000 [thread overview]
Message-ID: <20240902160436.793f145d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1070 bytes --]
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
rust/kernel/lib.rs
between commit:
4d080a029db1 ("rust: sizes: add commonly used constants")
from the net-next tree and commit:
a0d13aac7022 ("rust: rbtree: add red-black tree implementation backed by the C version")
from the rust 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 rust/kernel/lib.rs
index 58ed400198bf,f10b06a78b9d..000000000000
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@@ -43,7 -44,7 +44,8 @@@ pub mod net
pub mod page;
pub mod prelude;
pub mod print;
+ pub mod rbtree;
+pub mod sizes;
mod static_assert;
#[doc(hidden)]
pub mod std_vendor;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-09-02 6:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-02 6:04 Stephen Rothwell [this message]
2024-09-02 6:34 ` linux-next: manual merge of the rust tree with the net-next tree Miguel Ojeda
2024-09-24 0:50 ` Stephen Rothwell
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=20240902160436.793f145d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=fujita.tomonori@gmail$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mattgilbride@google$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ojeda@kernel$(echo .)org \
--cc=pabeni@redhat$(echo .)com \
--cc=wedsonaf@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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