linux-kernel - Re: [GIT PULL] Rust for 6.17

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-=wh4SfHyQAunGwspwO5wngSQTHqeNZ7Fo1Wub5BkDso4yA@mail.gmail.com>
Date: Sun, 3 Aug 2025 13:53:03 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Miguel Ojeda <ojeda@...nel.org>
Cc: Alex Gaynor <alex.gaynor@...il.com>, Boqun Feng <boqun.feng@...il.com>, 
	Gary Guo <gary@...yguo.net>, Björn Roy Baron <bjorn3_gh@...tonmail.com>, 
	Benno Lossin <lossin@...nel.org>, Andreas Hindborg <a.hindborg@...nel.org>, 
	Alice Ryhl <aliceryhl@...gle.com>, Trevor Gross <tmgross@...ch.edu>, 
	Danilo Krummrich <dakr@...nel.org>, rust-for-linux@...r.kernel.org, 
	linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] Rust for 6.17

On Sat, 2 Aug 2025 at 14:16, Miguel Ojeda <ojeda@...nel.org> wrote:
>
> There are a few conflicts, including a semantic one, but are all easy to
> apply. The resolutions in the latest linux-next are fine -- I also did a
> test merge with your state from a few hours ago:

Ok, apart from the semantic one that I entirely missed (until my build
failed and I checked your test merge), I got the same result as your
merge.

Well, apart from rust/helpers/helpers.c, in which the conflict was
from ordering things alphabetically, and then the new 'regulator.c'
file was out of order anyway, so I fixed that one too.

And I have to say, if this had come in one day later, I might not have
merged it at all. I'm about to fly away, and this was the kind of
somewhat complex infrastructure thing that I *really* would want to
see early, and not in the second week.

             Linus