Re: [GIT PULL] Rust for 6.15
From: Linus Torvalds
Date: Sun Mar 30 2025 - 20:07:42 EST
On Sun, 30 Mar 2025 at 10:07, Miguel Ojeda <ojeda@xxxxxxxxxx> 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