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

[Danilo Krummrich]

On Thu May 21, 2026 at 2:07 PM CEST, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
>   rust/kernel/alloc/kbox.rs
>
> between commit:
>
>   9b25d4111e913 ("rust: alloc: cleanup imports and use "kernel vertical" style")
>
> from the rust-alloc tree and commit:
>
>   abb21500e7e5d ("rust: alloc: add Box::zeroed()")
>
> from the driver-core tree.

Looks good, thanks!