Subject: Re: linux-next: manual merge of the rust tree with the driver-core tree

From: Danilo Krummrich <[email-masked]>
Date: Tue, 23 Sep 2025 18:49:02 +0200

On 9/23/25 6:44 PM, Mark Brown wrote:
> diff --cc rust/kernel/lib.rs
> index fa083aa44cd6f,f910a5ab80ba5..0000000000000
> --- a/rust/kernel/lib.rs
> +++ b/rust/kernel/lib.rs
> @@@ -17,8 -17,8 +17,9 @@@
>   // the unstable features in use.
>   //
>   // Stable since Rust 1.79.0.
> + #![feature(generic_nonzero)]
>   #![feature(inline_const)]
>  +#![feature(pointer_is_aligned)]
>   //
>   // Stable since Rust 1.81.0.
>   #![feature(lint_reasons)]

This hunk doesn't seem to be related to the driver-core tree.

> @@@ -115,7 -112,7 +117,8 @@@ pub mod pid_namespace
>   pub mod platform;
>   pub mod prelude;
>   pub mod print;
>  +pub mod processor;
> + pub mod ptr;
>   pub mod rbtree;
>   pub mod regulator;
>   pub mod revocable;

This one looks good, thanks!