From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: Danilo Krummrich <dakr@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Viresh Kumar <viresh.kumar@linaro•org>
Subject: linux-next: manual merge of the driver-core.current tree with Linus' tree
Date: Mon, 16 Jun 2025 09:38:30 +1000 [thread overview]
Message-ID: <20250616093830.49011634@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]
Hi all,
Today's linux-next merge of the driver-core.current tree got a conflict
in:
rust/helpers/helpers.c
between commit:
c7f005f70d22 ("rust: cpu: Add CpuId::current() to retrieve current CPU ID")
from Linus' tree and commit:
1b56e765bf89 ("rust: completion: implement initial abstraction")
from the driver-core.current 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/helpers/helpers.c
index 16fa9bca5949,6451cfd94a8d..000000000000
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@@ -13,7 -13,7 +13,8 @@@
#include "build_assert.c"
#include "build_bug.c"
#include "clk.c"
+ #include "completion.c"
+#include "cpu.c"
#include "cpufreq.c"
#include "cpumask.c"
#include "cred.c"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-06-15 23:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-15 23:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-01 23:37 linux-next: manual merge of the driver-core.current tree with Linus tree Stephen Rothwell
2013-01-05 2:33 ` Greg KH
2012-12-23 22:52 linux-next: manual merge of the driver-core.current tree with Linus' tree Stephen Rothwell
2012-12-23 22:56 ` Stephen Rothwell
2012-12-23 23:30 ` 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=20250616093830.49011634@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--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=viresh.kumar@linaro$(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