Re: Build break due to merge commit in linux-next 20250916

[Thorsten Leemhuis]

CCing Bert, who ran into a similar problem and send a similar patch.

On 16.09.25 16:45, Christian Heusel wrote:
> 
> I have noticed that the recent linux-next release fails to build due to
> a syntax error in the rust code:
> 
>       EXPORTS rust/exports_bindings_generated.h
>       RUSTC L rust/kernel.o
>     error: expected one of `,` or `}`, found `;`
>       --> rust/kernel/block/mq/gen_disk.rs:12:23
>        |
>     12 |     fmt::{self, Write};
>        |                       ^
>        |                       |
>        |                       expected one of `,` or `}`
>        |                       help: missing `,`
> 
>     error: aborting due to 1 previous error
> 
>     make[2]: *** [rust/Makefile:553: rust/kernel.o] Error 1
> 
> It seems like this error was introduced in 6e86e08cdc19 ("Merge branch
> 'rust-next' of https://github.com/Rust-for-Linux/linux.git";) and
> introduced with the merge, the attached patch fixes it.

Mark, that error from next-20250916 was gone in next-20250917, but came
back with next-20250918 yesterday. Maybe due to something git rerere had
recorded? But whatever, just wanted to let you know.

Ciao, Thorsten