* linux-next: manual merge of the cpufreq-arm tree with the configfs tree
@ 2025-05-13 2:03 Stephen Rothwell
2025-05-23 2:03 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2025-05-13 2:03 UTC (permalink / raw)
To: Viresh Kumar, Andreas Hindborg
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1920 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
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;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the cpufreq-arm tree with the configfs tree
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
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-05-23 2:03 UTC (permalink / raw)
To: Andreas Hindborg, Rafael J. Wysocki
Cc: Viresh Kumar, Linux Kernel Mailing List, Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the cpufreq-arm tree with the configfs tree
@ 2025-05-21 2:59 Stephen Rothwell
2025-05-23 2:02 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2025-05-21 2:59 UTC (permalink / raw)
To: Viresh Kumar, Andreas Hindborg
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the cpufreq-arm tree with the configfs tree
2025-05-21 2:59 Stephen Rothwell
@ 2025-05-23 2:02 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-05-23 2:02 UTC (permalink / raw)
To: Andreas Hindborg, Rafael J. Wysocki
Cc: Viresh Kumar, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-05-23 2:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
-- strict thread matches above, loose matches on Subject: below --
2025-05-21 2:59 Stephen Rothwell
2025-05-23 2:02 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox