From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miguel Ojeda <ojeda@kernel•org>, Greg KH <greg@kroah•com>,
Danilo Krummrich <dakr@kernel•org>,
"Rafael J. Wysocki" <rafael@kernel•org>
Cc: Tamir Duberstein <tamird@gmail•com>,
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 driver-core tree
Date: Mon, 10 Nov 2025 12:31:00 +1100 [thread overview]
Message-ID: <20251110123100.106b59d1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1596 bytes --]
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
rust/kernel/debugfs/traits.rs
between commits:
9c804d9cf2db ("rust: debugfs: support for binary large objects")
a9fca8a7b2c5 ("rust: debugfs: support blobs from smart pointers")
from the driver-core tree and commit:
3f0dd5fad9ac ("rust: debugfs: use `kernel::fmt`")
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/debugfs/traits.rs
index 510f9e0a5325,ad33bfbc7669..000000000000
--- a/rust/kernel/debugfs/traits.rs
+++ b/rust/kernel/debugfs/traits.rs
@@@ -3,15 -3,10 +3,15 @@@
//! Traits for rendering or updating values exported to DebugFS.
+use crate::alloc::Allocator;
+ use crate::fmt;
+use crate::fs::file;
use crate::prelude::*;
+use crate::sync::Arc;
use crate::sync::Mutex;
-use crate::uaccess::UserSliceReader;
+use crate::transmute::{AsBytes, FromBytes};
+use crate::uaccess::{UserSliceReader, UserSliceWriter};
- use core::fmt::{self, Debug, Formatter};
+use core::ops::{Deref, DerefMut};
use core::str::FromStr;
use core::sync::atomic::{
AtomicI16, AtomicI32, AtomicI64, AtomicI8, AtomicIsize, AtomicU16, AtomicU32, AtomicU64,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-11-10 1:31 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-10 1:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-20 7:11 linux-next: manual merge of the rust tree with the driver-core tree Stephen Rothwell
2025-11-20 9:15 ` Miguel Ojeda
2025-11-20 11:27 ` Tamir Duberstein
2025-11-21 4:39 ` Stephen Rothwell
2025-11-21 12:16 ` Tamir Duberstein
2025-11-21 15:56 ` Miguel Ojeda
2025-11-21 16:07 ` Greg KH
2025-11-23 16:39 ` Miguel Ojeda
2025-11-21 19:21 ` Danilo Krummrich
2025-11-14 4:18 Stephen Rothwell
2025-12-05 3:23 ` Stephen Rothwell
2025-11-10 1:24 Stephen Rothwell
2025-12-05 3:22 ` Stephen Rothwell
2025-09-23 16:44 Mark Brown
2025-09-23 16:49 ` Danilo Krummrich
2025-09-23 19:24 ` Miguel Ojeda
2025-09-24 8:04 ` Mark Brown
2025-09-24 8:25 ` Miguel Ojeda
2025-09-16 13:27 Mark Brown
2025-07-23 1:26 Stephen Rothwell
2025-07-23 12:49 ` Miguel Ojeda
2025-07-21 4:25 Stephen Rothwell
2025-07-21 8:24 ` Miguel Ojeda
2025-07-18 11:01 Stephen Rothwell
2025-07-18 10:46 Stephen Rothwell
2025-07-18 16:43 ` Danilo Krummrich
2025-07-18 10:26 Stephen Rothwell
2025-07-18 10:47 ` Stephen Rothwell
2025-07-15 8:26 Stephen Rothwell
2025-07-15 8:21 Stephen Rothwell
2025-07-11 8:04 Stephen Rothwell
2025-07-11 9:27 ` Tamir Duberstein
2025-07-11 7:59 Stephen Rothwell
2025-07-11 9:48 ` Miguel Ojeda
2025-07-01 7:46 Stephen Rothwell
2025-07-01 9:12 ` Miguel Ojeda
2025-03-21 7:56 Stephen Rothwell
2025-03-21 20:54 ` Miguel Ojeda
2025-04-01 3:21 ` Stephen Rothwell
2025-04-01 7:42 ` Greg KH
2025-01-14 4:46 Stephen Rothwell
2025-01-14 8:39 ` Miguel Ojeda
2025-01-23 3:30 ` Stephen Rothwell
2025-01-14 4:37 Stephen Rothwell
2025-01-14 8:38 ` Miguel Ojeda
2025-01-23 3:28 ` Stephen Rothwell
2025-01-13 4:12 Stephen Rothwell
2025-01-13 11:13 ` Miguel Ojeda
2025-01-23 3:31 ` Stephen Rothwell
2024-12-17 3:09 Stephen Rothwell
2024-12-17 8:15 ` Greg KH
2024-12-18 0:18 ` 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=20251110123100.106b59d1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dakr@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ojeda@kernel$(echo .)org \
--cc=rafael@kernel$(echo .)org \
--cc=tamird@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