linux-kernel - Re: [GIT PULL] Rust fixes for 6.15 merge

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHk-=wgyOSX4tbq0qhAkk0OCZqwiCA4EtwKZOBXAdkBW6FOANQ@mail.gmail.com>
Date: Mon, 31 Mar 2025 11:33:33 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Miguel Ojeda <ojeda@...nel.org>
Cc: rust-for-linux@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] Rust fixes for 6.15 merge

On Mon, 31 Mar 2025 at 05:29, Miguel Ojeda <ojeda@...nel.org> 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