Re: [GIT PULL] cpufreq/arm updates for 6.16

[Alice Ryhl <aliceryhl@google.com>]

On Wed, May 28, 2025 at 01:35:35PM +0200, Rafael J. Wysocki wrote:
> Two merge conflicts between this material and the mainline have
> emerged since v6.15.
> 
> I've resolved them (they appear to be straightforward to me), but I
> would appreciate double checking the most recent pm-cpufreq merge into
> linux-next:
> 
> https://web.git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=linux-next&id=25eb7dda15f182b7355488a5aca47078643633dc
> 
> and letting me know if it looks good.
> 
> Thanks!

Usually we keep them sorted:

diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h
index 88ab11d74fc7..2c917889d9ba 100644
--- a/rust/bindings/bindings_helper.h
+++ b/rust/bindings/bindings_helper.h
@@ -10,8 +10,8 @@
 #include <linux/blk-mq.h>
 #include <linux/blk_types.h>
 #include <linux/blkdev.h>
-#include <linux/configfs.h>
 #include <linux/clk.h>
+#include <linux/configfs.h>
 #include <linux/cpu.h>
 #include <linux/cpufreq.h>
 #include <linux/cpumask.h>
diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
index 6eb61c87b616..3a618f82fb02 100644
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@ -42,9 +42,9 @@
 pub mod block;
 #[doc(hidden)]
 pub mod build_assert;
+pub mod clk;
 #[cfg(CONFIG_CONFIGFS_FS)]
 pub mod configfs;
-pub mod clk;
 pub mod cpu;
 #[cfg(CONFIG_CPU_FREQ)]
 pub mod cpufreq;

Otherwise LGTM.

Alice