From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Danilo Krummrich <dakr@kernel•org>, Alice Ryhl <aliceryhl@google•com>
Cc: Abdiel Janulgue <abdiel.janulgue@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Shankari Anand <shankari.ak0208@gmail•com>
Subject: linux-next: manual merge of the rust-alloc tree with the drm-rust tree
Date: Fri, 5 Sep 2025 14:44:49 +1000 [thread overview]
Message-ID: <20250905144449.437ef3cf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1467 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
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>,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-05 4:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-05 4:44 Stephen Rothwell [this message]
2025-09-05 8:40 ` linux-next: manual merge of the rust-alloc tree with the drm-rust tree Danilo Krummrich
2025-09-08 8:00 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250905144449.437ef3cf@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=abdiel.janulgue@gmail$(echo .)com \
--cc=aliceryhl@google$(echo .)com \
--cc=dakr@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=shankari.ak0208@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox