Hi all,

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

  MAINTAINERS

between commit:

  f6d2900f2806 ("MAINTAINERS: Update the DMA Rust entry")

from the driver-core.current tree and commit:

  c58466b85b16 ("MAINTAINERS: rust: dma: add scatterlist files")

from the drm-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 MAINTAINERS
index 5bcaa26029f2,8a11e6c5dd80..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7263,18 -7251,20 +7276,20 @@@ F:	include/linux/dma-mapping.
  F:	include/linux/swiotlb.h
  F:	kernel/dma/
  
- DMA MAPPING HELPERS DEVICE DRIVER API [RUST]
+ DMA MAPPING & SCATTERLIST API [RUST]
 -M:	Abdiel Janulgue <abdiel.janulgue@gmail.com>
  M:	Danilo Krummrich <dakr@kernel.org>
 +R:	Abdiel Janulgue <abdiel.janulgue@gmail.com>
  R:	Daniel Almeida <daniel.almeida@collabora.com>
  R:	Robin Murphy <robin.murphy@arm.com>
  R:	Andreas Hindborg <a.hindborg@kernel.org>
  L:	rust-for-linux@vger.kernel.org
  S:	Supported
  W:	https://rust-for-linux.com
 -T:	git https://github.com/Rust-for-Linux/linux.git alloc-next
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git
  F:	rust/helpers/dma.c
+ F:	rust/helpers/scatterlist.c
  F:	rust/kernel/dma.rs
+ F:	rust/kernel/scatterlist.rs
  F:	samples/rust/rust_dma.rs
  
  DMA-BUF HEAPS FRAMEWORK

On 9/12/25 4:01 AM, Stephen Rothwell wrote:
> diff --cc MAINTAINERS
> index 5bcaa26029f2,8a11e6c5dd80..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -7263,18 -7251,20 +7276,20 @@@ F:	include/linux/dma-mapping.
>   F:	include/linux/swiotlb.h
>   F:	kernel/dma/
>   
> - DMA MAPPING HELPERS DEVICE DRIVER API [RUST]
> + DMA MAPPING & SCATTERLIST API [RUST]
>  -M:	Abdiel Janulgue <abdiel.janulgue@gmail.com>
>   M:	Danilo Krummrich <dakr@kernel.org>
>  +R:	Abdiel Janulgue <abdiel.janulgue@gmail.com>
>   R:	Daniel Almeida <daniel.almeida@collabora.com>
>   R:	Robin Murphy <robin.murphy@arm.com>
>   R:	Andreas Hindborg <a.hindborg@kernel.org>
>   L:	rust-for-linux@vger.kernel.org
>   S:	Supported
>   W:	https://rust-for-linux.com
>  -T:	git https://github.com/Rust-for-Linux/linux.git alloc-next
>  +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git
>   F:	rust/helpers/dma.c
> + F:	rust/helpers/scatterlist.c
>   F:	rust/kernel/dma.rs
> + F:	rust/kernel/scatterlist.rs
>   F:	samples/rust/rust_dma.rs
>   
>   DMA-BUF HEAPS FRAMEWORK

Looks good, thanks!