On Wed Aug 13, 2025 at 5:59 AM CEST, Andrew Morton wrote:
> Thanks.
>
> Well that's messy.
I think it's not too bad, the changes are just too close to each other -- no
semantic conflict.
As a general heads-up, Rust code is a bit more prone to conflicts.
On one hand this is due to the more powerf
On Wed Aug 13, 2025 at 3:11 AM CEST, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mm-unstable tree got a conflict in:
>
> rust/kernel/alloc/allocator.rs
>
> between commit:
>
> fde578c86281 ("rust: alloc: replace aligned_size() with
> Kmalloc::aligned_layout()")
>
> fr
On Wed, 13 Aug 2025 11:11:51 +1000 Stephen Rothwell
wrote:
> Hi all,
>
> Today's linux-next merge of the mm-unstable tree got a conflict in:
>
> rust/kernel/alloc/allocator.rs
>
> between commit:
>
> fde578c86281 ("rust: alloc: replace aligned_size() with
> Kmalloc::aligned_layout()")
>
