linux-next: manual merge of the rust tree with the driver-core tree

Stephen Rothwell
2025-11-10T01:31:02Z

[-- 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,