Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  rust/kernel/device.rs

between commit:

  8510ef5e3cfb ("rust: device: Remove explicit import of CStrExt")

from the driver-core.current tree and commit:

  f0c6ea853bd7 ("rust: device: replace `kernel::c_str!` with C-Strings")

from the driver-core 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/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`.
@@@ -158,8 -156,9 +155,8 @@@ static_assert!(core::mem::size_of::<bin
  /// `bindings::device::release` is valid to be called from any thread, hence `ARef<Device>` can be
  /// dropped from any thread.
  ///
- /// [`AlwaysRefCounted`]: kernel::types::AlwaysRefCounted
+ /// [`AlwaysRefCounted`]: kernel::sync::aref::AlwaysRefCounted
  /// [`impl_device_context_deref`]: kernel::impl_device_context_deref
 -/// [`pci::Device`]: kernel::pci::Device
  /// [`platform::Device`]: kernel::platform::Device
  #[repr(transparent)]
  pub struct Device<Ctx: DeviceContext = Normal>(Opaque<bindings::device>, PhantomData<Ctx>);

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