linux-kernel - Re: linux-next: manual merge of the rust tree with the vfs-brauner tree

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] [day] [month] [year] [list]

Message-ID: <CANiq72kSLL-=pjDqhe7Ftd8zh1YoQ2wacX+js9JMhiXCdCu-0Q@mail.gmail.com>
Date: Fri, 4 Oct 2024 11:25:29 +0200
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Miguel Ojeda <ojeda@...nel.org>, Christian Brauner <brauner@...nel.org>, 
	Alice Ryhl <aliceryhl@...gle.com>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the rust tree with the vfs-brauner tree

On Fri, Oct 4, 2024 at 6:42 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   rust/kernel/types.rs
>
> between commit:
>
>   e7572e5deaf3 ("rust: types: add `NotThreadSafe`")
>
> from the vfs-brauner tree and commits:
>
>   c4277ae2a630 ("rust: types: avoid repetition in `{As,From}Bytes` impls")
>   432526d4ff32 ("rust: enable `clippy::undocumented_unsafe_blocks` lint")
>
> from the rust tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good, thanks as usual!

Cheers,
Miguel