linux-kernel - linux-next: manual merge of the drm-rust 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-next>] [day] [month] [year] [list]

Message-ID: <20250912120159.1d6518cc@canb.auug.org.au>
Date: Fri, 12 Sep 2025 12:01:59 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Alice Ryhl <aliceryhl@...gle.com>, Danilo Krummrich <dakr@...nel.org>,
 Greg KH <greg@...ah.com>, "Rafael J. Wysocki" <rafael@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the drm-rust tree with the
 driver-core.current tree

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@...il.com>
  M:	Danilo Krummrich <dakr@...nel.org>
 +R:	Abdiel Janulgue <abdiel.janulgue@...il.com>
  R:	Daniel Almeida <daniel.almeida@...labora.com>
  R:	Robin Murphy <robin.murphy@....com>
  R:	Andreas Hindborg <a.hindborg@...nel.org>
  L:	rust-for-linux@...r.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

Content of type "application/pgp-signature" skipped