From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Viresh Kumar <viresh.kumar@linaro•org>,
Andreas Hindborg <a.hindborg@kernel•org>
Cc: 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 cpufreq-arm tree with the configfs tree
Date: Wed, 21 May 2025 12:59:46 +1000 [thread overview]
Message-ID: <20250521125946.664a79c1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1366 bytes --]
Hi all,
Today's linux-next merge of the cpufreq-arm tree got a conflict in:
rust/kernel/lib.rs
between commit:
446cafc295bf ("rust: configfs: introduce rust support for configfs")
from the configfs tree and commits:
8961b8cb3099 ("rust: cpumask: Add initial abstractions")
d01d70205601 ("rust: clk: Add initial abstractions")
3accb57d56a9 ("rust: cpu: Add from_cpu()")
2207856ff0bc ("rust: cpufreq: Add initial abstractions for cpufreq framework")
from the cpufreq-arm 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/lib.rs
index 354eb1605194,133ebee4f9d3..000000000000
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@@ -42,8 -42,11 +42,13 @@@ pub mod alloc
pub mod block;
#[doc(hidden)]
pub mod build_assert;
+ pub mod clk;
+#[cfg(CONFIG_CONFIGFS_FS)]
+pub mod configfs;
+ pub mod cpu;
+ #[cfg(CONFIG_CPU_FREQ)]
+ pub mod cpufreq;
+ pub mod cpumask;
pub mod cred;
pub mod device;
pub mod device_id;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-05-21 2:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-21 2:59 Stephen Rothwell [this message]
2025-05-23 2:02 ` linux-next: manual merge of the cpufreq-arm tree with the configfs tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-05-13 2:03 Stephen Rothwell
2025-05-23 2:03 ` 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=20250521125946.664a79c1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=a.hindborg@kernel$(echo .)org \
--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