linux-kernel - Re: linux-next: manual merge of the rust tree with the modules 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: <13c0ac62-cfa9-4b96-9cfa-807def89593e@kernel.org>
Date: Tue, 4 Nov 2025 09:52:40 +0100
From: Daniel Gomez <da.gomez@...nel.org>
To: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>,
 Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Miguel Ojeda <ojeda@...nel.org>, Luis Chamberlain <mcgrof@...nel.org>,
 Petr Pavlu <petr.pavlu@...e.com>, Sami Tolvanen <samitolvanen@...gle.com>,
 Daniel Gomez <da.gomez@...sung.com>, Andreas Hindborg
 <a.hindborg@...nel.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Tamir Duberstein <tamird@...il.com>
Subject: Re: linux-next: manual merge of the rust tree with the modules tree



On 04/11/2025 00.59, Miguel Ojeda wrote:
> On Tue, Nov 4, 2025 at 12:55 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>>
>> Today's linux-next merge of the rust tree got a conflict in:
>>
>>   rust/kernel/str.rs
>>
>> between commit:
>>
>>   51d9ee90ea90 ("rust: str: add radix prefixed integer parsing functions")
>>
>> from the modules tree and commit:
>>
>>   3b83f5d5e78a ("rust: replace `CStr` with `core::ffi::CStr`")
>>
>> from the rust tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary. This
> 
> Looks good, thanks!
> 
> Cheers,
> Miguel

Yes, looks good to me as weel. Thanks!