From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miguel Ojeda <ojeda@kernel•org>, Christian Brauner <brauner@kernel•org>
Cc: Alice Ryhl <aliceryhl@google•com>, Gary Guo <gary@garyguo•net>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the rust tree with the vfs-brauner tree
Date: Mon, 11 Nov 2024 17:29:47 +1100 [thread overview]
Message-ID: <20241111172947.63ee16dc@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1532 bytes --]
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
rust/kernel/task.rs
between commits:
e7572e5deaf3 ("rust: types: add `NotThreadSafe`")
8ad1a41f7e23 ("rust: file: add `Kuid` wrapper")
e0020ba6cbcb ("rust: add PidNamespace")
from the vfs-brauner tree and commit:
d072acda4862 ("rust: use custom FFI integer types")
from the rust tree.
I fixed it up (I think - 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/task.rs
index 5120dddaf916,5bce090a3869..000000000000
--- a/rust/kernel/task.rs
+++ b/rust/kernel/task.rs
@@@ -4,17 -4,9 +4,17 @@@
//!
//! C header: [`include/linux/sched.h`](srctree/include/linux/sched.h).
+ use crate::ffi::{c_int, c_long, c_uint};
-use crate::types::Opaque;
-use core::{marker::PhantomData, ops::Deref, ptr};
+use crate::{
+ bindings,
+ pid_namespace::PidNamespace,
+ types::{ARef, NotThreadSafe, Opaque},
+};
+use core::{
+ cmp::{Eq, PartialEq},
- ffi::{c_int, c_long, c_uint},
+ ops::Deref,
+ ptr,
+};
/// A sentinel value used for infinite timeouts.
pub const MAX_SCHEDULE_TIMEOUT: c_long = c_long::MAX;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-11-11 6:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-11 6:29 Stephen Rothwell [this message]
2024-11-11 23:57 ` linux-next: manual merge of the rust tree with the vfs-brauner tree Miguel Ojeda
-- strict thread matches above, loose matches on Subject: below --
2025-09-16 13:30 Mark Brown
2025-09-16 13:45 ` Miguel Ojeda
2025-06-24 6:23 Stephen Rothwell
2025-06-24 8:54 ` Miguel Ojeda
2024-10-08 5:56 Stephen Rothwell
2024-10-04 4:42 Stephen Rothwell
2024-10-04 9:25 ` Miguel Ojeda
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=20241111172947.63ee16dc@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=aliceryhl@google$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=gary@garyguo$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ojeda@kernel$(echo .)org \
/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