Hi all,

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

  rust/kernel/alloc/kvec.rs

between commit:

  779db37373a38 ("rust: alloc: kvec: implement AsPageIter for VVec")

from the drm-rust tree and commit:

  1f96115f502ab ("rust: alloc: use `kernel::{fmt,prelude::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.

diff --cc rust/kernel/alloc/kvec.rs
index 38ed271b1d045,dfc101e03f358..0000000000000
--- a/rust/kernel/alloc/kvec.rs
+++ b/rust/kernel/alloc/kvec.rs
@@@ -3,14 -3,13 +3,14 @@@
  //! Implementation of [`Vec`].
  
  use super::{
 -    allocator::{KVmalloc, Kmalloc, Vmalloc},
 +    allocator::{KVmalloc, Kmalloc, Vmalloc, VmallocPageIter},
      layout::ArrayLayout,
 -    AllocError, Allocator, Box, Flags,
 +    AllocError, Allocator, Box, Flags, NumaNode,
  };
 +use crate::page::AsPageIter;
+ use crate::fmt;
  use core::{
      borrow::{Borrow, BorrowMut},
-     fmt,
      marker::PhantomData,
      mem::{ManuallyDrop, MaybeUninit},
      ops::Deref,

On Tue, Sep 16, 2025 at 3:10 PM Mark Brown <broonie@kernel.org> wrote:
>
>  +use crate::page::AsPageIter;
> + use crate::fmt;

These should be the other way around to pass `rustfmt` (please see diff below).

I noticed now that we have cleared the other issues. If it could be
fixed in the merge commit, it would be great, thanks!

Cheers,
Miguel

diff --git a/rust/kernel/alloc/kvec.rs b/rust/kernel/alloc/kvec.rs
index 3d38d9bde582d..2cc147a4cb881 100644
--- a/rust/kernel/alloc/kvec.rs
+++ b/rust/kernel/alloc/kvec.rs
@@ -7,8 +7,8 @@
     layout::ArrayLayout,
     AllocError, Allocator, Box, Flags, NumaNode,
 };
-use crate::page::AsPageIter;
 use crate::fmt;
+use crate::page::AsPageIter;
 use core::{
     borrow::{Borrow, BorrowMut},
     marker::PhantomData,