Subject: Re: linux-next: manual merge of the cpufreq-arm tree with the configfs tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 23 May 2025 12:03:49 +1000

Hi all,

On Tue, 13 May 2025 12:03:42 +1000 Stephen Rothwell <[email-masked]> 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