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

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-=wjpDpK0cd=tBk2t005nrddL0hXRQ+h+iZPHfVsi6qQY+w@mail.gmail.com>
Date: Sun, 30 Mar 2025 17:07:12 -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 <benno.lossin@...ton.me>, 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.15

On Sun, 30 Mar 2025 at 10:07, Miguel Ojeda <ojeda@...nel.org> wrote:
>
> The second is that there are non-trivial conflicts, in particular a
> semantic conflict.

Thanks. I decided to try to do the merge on my own, but failed. I came
close, but it was good to have your example merge to see what I got
wrong.

The pin_init becoming a crate of its own, but 'pin::Pin' being in the
core crate ended up messing with my "monkey see, monkey do" approach
to Rust merges.

I'll learn eventually, in the meantime please do continue to give me
example merges and I'll use them as training wheels.

               Linus