* linux-next: manual merge of the drm-rust tree with the driver-core.current tree
@ 2025-09-12 2:01 Stephen Rothwell
2025-09-12 7:57 ` Danilo Krummrich
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-09-12 2:01 UTC (permalink / raw)
To: Alice Ryhl, Danilo Krummrich, Greg KH, Rafael J. Wysocki
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1740 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the drm-rust tree with the driver-core.current tree
2025-09-12 2:01 linux-next: manual merge of the drm-rust tree with the driver-core.current tree Stephen Rothwell
@ 2025-09-12 7:57 ` Danilo Krummrich
0 siblings, 0 replies; 2+ messages in thread
From: Danilo Krummrich @ 2025-09-12 7:57 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Alice Ryhl, Greg KH, Rafael J. Wysocki, Linux Kernel Mailing List,
Linux Next Mailing List
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!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-09-12 7:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-12 2:01 linux-next: manual merge of the drm-rust tree with the driver-core.current tree Stephen Rothwell
2025-09-12 7:57 ` Danilo Krummrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox