From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miguel Ojeda <ojeda@kernel•org>, Greg KH <greg@kroah•com>
Cc: Abdiel Janulgue <abdiel.janulgue@gmail•com>,
Danilo Krummrich <dakr@kernel•org>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the rust tree with the driver-core tree
Date: Fri, 21 Mar 2025 18:56:30 +1100 [thread overview]
Message-ID: <20250321185630.566dc075@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2567 bytes --]
Hi all,
Today's linux-next merge of the rust tree got a semantic conflict in:
samples/rust/rust_dma.rs
between commit:
7b948a2af6b5 ("rust: pci: fix unrestricted &mut pci::Device")
from the driver-core tree and commit:
9901addae63b ("samples: rust: add Rust dma test sample driver")
from the rust tree.
I fixed it up (I applied the following supplied resolution, thanks Danilo)
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.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 21 Mar 2025 18:21:27 +1100
Subject: [PATCH] fix up for "samples: rust: add Rust dma test sample driver"
interacting with commit
7b948a2af6b5 ("rust: pci: fix unrestricted &mut pci::Device")
from the driver-core tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
samples/rust/rust_dma.rs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/samples/rust/rust_dma.rs b/samples/rust/rust_dma.rs
index 908acd34b8db..874c2c964afa 100644
--- a/samples/rust/rust_dma.rs
+++ b/samples/rust/rust_dma.rs
@@ -4,10 +4,10 @@
//!
//! To make this driver probe, QEMU must be run with `-device pci-testdev`.
-use kernel::{bindings, dma::CoherentAllocation, pci, prelude::*};
+use kernel::{bindings, device::Core, dma::CoherentAllocation, pci, prelude::*, types::ARef};
struct DmaSampleDriver {
- pdev: pci::Device,
+ pdev: ARef<pci::Device>,
ca: CoherentAllocation<MyStruct>,
}
@@ -48,7 +48,7 @@ impl pci::Driver for DmaSampleDriver {
type IdInfo = ();
const ID_TABLE: pci::IdTable<Self::IdInfo> = &PCI_TABLE;
- fn probe(pdev: &mut pci::Device, _info: &Self::IdInfo) -> Result<Pin<KBox<Self>>> {
+ fn probe(pdev: &pci::Device<Core>, _info: &Self::IdInfo) -> Result<Pin<KBox<Self>>> {
dev_info!(pdev.as_ref(), "Probe DMA test driver.\n");
let ca: CoherentAllocation<MyStruct> =
@@ -64,7 +64,7 @@ fn probe(pdev: &mut pci::Device, _info: &Self::IdInfo) -> Result<Pin<KBox<Self>>
let drvdata = KBox::new(
Self {
- pdev: pdev.clone(),
+ pdev: pdev.into(),
ca,
},
GFP_KERNEL,
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-03-21 7:56 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-21 7:56 Stephen Rothwell [this message]
2025-03-21 20:54 ` linux-next: manual merge of the rust tree with the driver-core tree Miguel Ojeda
2025-04-01 3:21 ` Stephen Rothwell
2025-04-01 7:42 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2025-11-20 7:11 Stephen Rothwell
2025-11-20 9:15 ` Miguel Ojeda
2025-11-20 11:27 ` Tamir Duberstein
2025-11-21 4:39 ` Stephen Rothwell
2025-11-21 12:16 ` Tamir Duberstein
2025-11-21 15:56 ` Miguel Ojeda
2025-11-21 16:07 ` Greg KH
2025-11-23 16:39 ` Miguel Ojeda
2025-11-21 19:21 ` Danilo Krummrich
2025-11-14 4:18 Stephen Rothwell
2025-12-05 3:23 ` Stephen Rothwell
2025-11-10 1:31 Stephen Rothwell
2025-11-10 1:24 Stephen Rothwell
2025-12-05 3:22 ` Stephen Rothwell
2025-09-23 16:44 Mark Brown
2025-09-23 16:49 ` Danilo Krummrich
2025-09-23 19:24 ` Miguel Ojeda
2025-09-24 8:04 ` Mark Brown
2025-09-24 8:25 ` Miguel Ojeda
2025-09-16 13:27 Mark Brown
2025-07-23 1:26 Stephen Rothwell
2025-07-23 12:49 ` Miguel Ojeda
2025-07-21 4:25 Stephen Rothwell
2025-07-21 8:24 ` Miguel Ojeda
2025-07-18 11:01 Stephen Rothwell
2025-07-18 10:46 Stephen Rothwell
2025-07-18 16:43 ` Danilo Krummrich
2025-07-18 10:26 Stephen Rothwell
2025-07-18 10:47 ` Stephen Rothwell
2025-07-15 8:26 Stephen Rothwell
2025-07-15 8:21 Stephen Rothwell
2025-07-11 8:04 Stephen Rothwell
2025-07-11 9:27 ` Tamir Duberstein
2025-07-11 7:59 Stephen Rothwell
2025-07-11 9:48 ` Miguel Ojeda
2025-07-01 7:46 Stephen Rothwell
2025-07-01 9:12 ` Miguel Ojeda
2025-01-14 4:46 Stephen Rothwell
2025-01-14 8:39 ` Miguel Ojeda
2025-01-23 3:30 ` Stephen Rothwell
2025-01-14 4:37 Stephen Rothwell
2025-01-14 8:38 ` Miguel Ojeda
2025-01-23 3:28 ` Stephen Rothwell
2025-01-13 4:12 Stephen Rothwell
2025-01-13 11:13 ` Miguel Ojeda
2025-01-23 3:31 ` Stephen Rothwell
2024-12-17 3:09 Stephen Rothwell
2024-12-17 8:15 ` Greg KH
2024-12-18 0:18 ` Miguel Ojeda
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=20250321185630.566dc075@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=abdiel.janulgue@gmail$(echo .)com \
--cc=dakr@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ojeda@kernel$(echo .)org \
/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