From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Danilo Krummrich <dakr@kernel•org>,
"Rafael J. Wysocki" <rafael@kernel•org>
Cc: FUJITA Tomonori <fujita.tomonori@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Tamir Duberstein <tamird@gmail•com>
Subject: linux-next: manual merge of the driver-core tree with the driver-core.current tree
Date: Wed, 7 Jan 2026 15:29:19 +1100 [thread overview]
Message-ID: <20260107152919.19977947@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1840 bytes --]
Hi all,
Today's linux-next merge of the driver-core tree got a conflict in:
rust/kernel/device.rs
between commit:
8510ef5e3cfb ("rust: device: Remove explicit import of CStrExt")
from the driver-core.current tree and commit:
f0c6ea853bd7 ("rust: device: replace `kernel::c_str!` with C-Strings")
from the driver-core 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 rust/kernel/device.rs
index 71b200df0f40,a13f6ee24b09..000000000000
--- a/rust/kernel/device.rs
+++ b/rust/kernel/device.rs
@@@ -12,9 -12,8 +12,6 @@@ use crate::
};
use core::{any::TypeId, marker::PhantomData, ptr};
- #[cfg(CONFIG_PRINTK)]
- use crate::c_str;
-use crate::str::CStrExt as _;
--
pub mod property;
// Assert that we can `read()` / `write()` a `TypeId` instance from / into `struct driver_type`.
@@@ -158,8 -156,9 +155,8 @@@ static_assert!(core::mem::size_of::<bin
/// `bindings::device::release` is valid to be called from any thread, hence `ARef<Device>` can be
/// dropped from any thread.
///
- /// [`AlwaysRefCounted`]: kernel::types::AlwaysRefCounted
+ /// [`AlwaysRefCounted`]: kernel::sync::aref::AlwaysRefCounted
/// [`impl_device_context_deref`]: kernel::impl_device_context_deref
-/// [`pci::Device`]: kernel::pci::Device
/// [`platform::Device`]: kernel::platform::Device
#[repr(transparent)]
pub struct Device<Ctx: DeviceContext = Normal>(Opaque<bindings::device>, PhantomData<Ctx>);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-01-07 4:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-07 4:29 Stephen Rothwell [this message]
2026-01-07 14:38 ` linux-next: manual merge of the driver-core tree with the driver-core.current tree Danilo Krummrich
-- strict thread matches above, loose matches on Subject: below --
2020-04-30 4:25 Stephen Rothwell
2020-04-30 8:15 ` Greg KH
2013-12-09 3:47 Stephen Rothwell
2013-12-09 8:21 ` Greg KH
2013-06-19 5:32 Stephen Rothwell
2013-06-19 5:55 ` Greg KH
2013-06-19 6:58 ` Ming Lei
2013-06-19 14:39 ` Greg KH
2013-06-19 15:04 ` Ming Lei
2013-06-19 16:36 ` Greg KH
2013-06-20 0:23 ` Ming Lei
2013-06-20 1:06 ` Stephen Rothwell
2013-06-20 1:22 ` Ming Lei
2013-06-20 3:28 ` Greg KH
2013-06-20 3:46 ` Ming Lei
2013-06-20 3:49 ` Stephen Rothwell
2013-06-19 7:12 ` Stephen Rothwell
2013-06-19 7:21 ` Ming Lei
2012-02-03 3:51 Stephen Rothwell
2012-02-03 15:07 ` Greg KH
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=20260107152919.19977947@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dakr@kernel$(echo .)org \
--cc=fujita.tomonori@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rafael@kernel$(echo .)org \
--cc=tamird@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