Re: [GIT PULL] Rust fixes for 6.15 merge

From: Linus Torvalds
Date: Mon Mar 31 2025 - 14:34:07 EST


On Mon, 31 Mar 2025 at 05:29, Miguel Ojeda <ojeda@xxxxxxxxxx> wrote:
>
> A small fix due to a typo during merge.

Well, duh.

Sometimes I have too much copy-paste, in this case I obviously didn't
have enough of it, and just fixed the conflict - incorrectly - by
hand.

I obviously didn't see any bad effects of this typo in my build
testing, which means that clearly this rust-analyzer thing isn't
getting exercised by my normal build.

Now that I know about the typo, I can see the error with

make rust-analyzer

and it's not like I'm going to add this to my normal build rules, but
maybe you can give a list of things that I should be doing when I see
rust merge conflicts so that next time around I'll notice these things
rather than have silly typo mistakes.

Thanks,
Linus