linux-kernel - Re: linux-next: manual merge of the driver-core tree with the driver-core.current 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <a79281e8-cadf-4960-9542-e6ed4736f7c9@kernel.org>
Date: Wed, 7 Jan 2026 15:38:37 +0100
From: Danilo Krummrich <dakr@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Greg KH <greg@...ah.com>, "Rafael J. Wysocki" <rafael@...nel.org>,
 FUJITA Tomonori <fujita.tomonori@...il.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Tamir Duberstein <tamird@...il.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the
 driver-core.current tree

On 1/7/26 5:29 AM, Stephen Rothwell wrote:
> diff --cc rust/kernel/device.rs
> index 71b200df0f40,a13f6ee24b09..000000000000
> --- a/rust/kernel/device.rs
> +++ b/rust/kernel/device.rs
> @@@ -12,9 -12,8 +12,6 @@@ use crate::
>   };
>   use core::{any::TypeId, marker::PhantomData, ptr};
>   
> - #[cfg(CONFIG_PRINTK)]
> - use crate::c_str;
>  -use crate::str::CStrExt as _;
> --
>   pub mod property;
>   
>   // Assert that we can `read()` / `write()` a `TypeId` instance from / into `struct driver_type`.

Looks good to me, thanks!

(The conflict should go away after the next -rc release.)