[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20250908180023.177539cd@canb.auug.org.au>
Date: Mon, 8 Sep 2025 18:00:23 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Danilo Krummrich <dakr@...nel.org>, Alice Ryhl <aliceryhl@...gle.com>,
Miguel Ojeda <ojeda@...nel.org>
Cc: Abdiel Janulgue <abdiel.janulgue@...il.com>, Linux Kernel Mailing List
<linux-kernel@...r.kernel.org>, Linux Next Mailing List
<linux-next@...r.kernel.org>, Shankari Anand <shankari.ak0208@...il.com>
Subject: Re: linux-next: manual merge of the rust-alloc tree with the
drm-rust tree
Hi all,
On Fri, 5 Sep 2025 14:44:49 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the rust-alloc tree got a conflict in:
>
> samples/rust/rust_dma.rs
>
> between commit:
>
> 5444799d701c ("samples: rust: dma: add sample code for SGTable")
>
> from the drm-rust tree and commit:
>
> 7e25d84f460c ("rust: dma: Update ARef and AlwaysRefCounted imports from sync::aref")
>
> from the rust-alloc 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 samples/rust/rust_dma.rs
> index f55c6a37ccd9,997a9c4cf2b3..000000000000
> --- a/samples/rust/rust_dma.rs
> +++ b/samples/rust/rust_dma.rs
> @@@ -5,15 -5,14 +5,15 @@@
> //! To make this driver probe, QEMU must be run with `-device pci-testdev`.
>
> use kernel::{
> - bindings,
> device::Core,
> - dma::{CoherentAllocation, Device, DmaMask},
> - pci,
> + dma::{CoherentAllocation, DataDirection, Device, DmaMask},
> + page, pci,
> prelude::*,
> + scatterlist::{Owned, SGTable},
> - types::ARef,
> + sync::aref::ARef,
> };
>
> +#[pin_data(PinnedDrop)]
> struct DmaSampleDriver {
> pdev: ARef<pci::Device>,
> ca: CoherentAllocation<MyStruct>,
This is now a conflict between the rust tree and the drm-rust tree.
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists