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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20251110123100.106b59d1@canb.auug.org.au>
Date: Mon, 10 Nov 2025 12:31:00 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Miguel Ojeda <ojeda@...nel.org>, Greg KH <greg@...ah.com>, Danilo
 Krummrich <dakr@...nel.org>, "Rafael J. Wysocki" <rafael@...nel.org>
Cc: Tamir Duberstein <tamird@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the rust tree with the driver-core tree

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,

Content of type "application/pgp-signature" skipped