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: Boqun Feng <boqun.feng@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miguel Ojeda <ojeda@kernel•org>,
Tamir Duberstein <tamird@gmail•com>
Subject: linux-next: manual merge of the driver-core tree with Linus' tree
Date: Fri, 5 Dec 2025 14:20:31 +1100 [thread overview]
Message-ID: <20251205142031.7404c49d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 883 bytes --]
Hi all,
Today's linux-next merge of the driver-core tree got a conflict in:
rust/kernel/debugfs/traits.rs
between commits:
f74cf399e02e ("rust: debugfs: Replace the usage of Rust native atomics")
3f0dd5fad9ac ("rust: debugfs: use `kernel::fmt`")
from Linus' tree and commits:
9c804d9cf2db ("rust: debugfs: support for binary large objects")
a9fca8a7b2c5 ("rust: debugfs: support blobs from smart pointers")
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-12-05 3:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-05 3:20 Stephen Rothwell [this message]
2025-12-05 3:26 ` linux-next: manual merge of the driver-core tree with Linus' tree Miguel Ojeda
2025-12-05 4:01 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2015-08-07 5:26 Stephen Rothwell
2015-08-07 5:30 ` Viresh Kumar
2014-12-15 3:09 Stephen Rothwell
2013-01-23 4:15 Stephen Rothwell
2013-01-23 4:42 ` Greg KH
2012-05-01 5:01 Stephen Rothwell
2012-05-01 13:46 ` Greg KH
2012-05-04 23:19 ` Greg KH
2012-01-30 2:24 Stephen Rothwell
2012-01-30 2:35 ` Greg KH
2012-02-02 19:26 ` Greg KH
2011-12-28 5:28 Stephen Rothwell
2012-01-04 23:08 ` Greg KH
2010-01-18 7:49 Stephen Rothwell
2010-01-19 20:59 ` Greg KH
2010-01-19 23:43 ` 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=20251205142031.7404c49d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=boqun.feng@gmail$(echo .)com \
--cc=dakr@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ojeda@kernel$(echo .)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