From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andreas Hindborg <a.hindborg@kernel•org>,
"Rafael J. Wysocki" <rjw@rjwysocki•net>
Cc: Viresh Kumar <viresh.kumar@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the cpufreq-arm tree with the configfs tree
Date: Fri, 23 May 2025 12:03:49 +1000 [thread overview]
Message-ID: <20250523120349.2ab6ef8f@canb.auug.org.au> (raw)
In-Reply-To: <20250513120342.10988bf5@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2198 bytes --]
Hi all,
On Tue, 13 May 2025 12:03:42 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the cpufreq-arm tree got conflicts in:
>
> rust/bindings/bindings_helper.h
> rust/kernel/lib.rs
>
> between commit:
>
> 446cafc295bf ("rust: configfs: introduce rust support for configfs")
>
> from the configfs tree and commits:
>
> 6fa5ce832520 ("rust: cpumask: Add initial abstractions")
> 5feb286e16f4 ("rust: clk: Add helpers for Rust code")
> 3044627e1494 ("rust: cpu: Add from_cpu()")
> 254df142ab42 ("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.
>
>
> diff --cc rust/bindings/bindings_helper.h
> index 1a532b83a9af,7c1d78f68076..000000000000
> --- a/rust/bindings/bindings_helper.h
> +++ b/rust/bindings/bindings_helper.h
> @@@ -10,7 -10,9 +10,10 @@@
> #include <linux/blk-mq.h>
> #include <linux/blk_types.h>
> #include <linux/blkdev.h>
> + #include <linux/clk.h>
> +#include <linux/configfs.h>
> + #include <linux/cpu.h>
> + #include <linux/cpufreq.h>
> #include <linux/cpumask.h>
> #include <linux/cred.h>
> #include <linux/device/faux.h>
> diff --cc rust/kernel/lib.rs
> index 354eb1605194,871fcdc09b35..000000000000
> --- a/rust/kernel/lib.rs
> +++ b/rust/kernel/lib.rs
> @@@ -42,8 -42,12 +42,14 @@@ pub mod alloc
> pub mod block;
> #[doc(hidden)]
> pub mod build_assert;
> + #[cfg(CONFIG_COMMON_CLK)]
> + 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;
This is now a conflict between the pm tree and the configfs tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-05-23 2:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-13 2:03 linux-next: manual merge of the cpufreq-arm tree with the configfs tree Stephen Rothwell
2025-05-23 2:03 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-21 2:59 Stephen Rothwell
2025-05-23 2:02 ` 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=20250523120349.2ab6ef8f@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=rjw@rjwysocki$(echo .)net \
--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