Subject: Re: linux-next: manual merge of the driver-core tree with the driver-core.current tree

From: Danilo Krummrich <[email-masked]>
Date: Wed, 7 Jan 2026 15:38:37 +0100

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.)