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;

Hi all,

On Wed, 21 May 2025 12:59:46 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.
> 
> 
> 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;

This is now a conflict between the pm tree and the configfs tree.

-- 
Cheers,
Stephen Rothwell