linux-kernel - Re: linux-next: manual merge of the rust tree with the driver-core 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: <20250718204746.729d027b@canb.auug.org.au>
Date: Fri, 18 Jul 2025 20:47:46 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Miguel Ojeda <ojeda@...nel.org>
Cc: Danilo Krummrich <dakr@...nel.org>, FUJITA Tomonori
 <fujita.tomonori@...il.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 driver-core
 tree

Hi all,


On Fri, 18 Jul 2025 20:26:12 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got conflicts in:
> 
>   rust/kernel/device_id.rs
>   rust/kernel/devres.rs
> 
> between commits:
> 
>   8d84b32075fb ("rust: device_id: split out index support into a separate trait")
>   f5d3ef25d238 ("rust: devres: get rid of Devres' inner Arc")
> 
> from the driver-core tree and various commits from the rust tree.

Ignore this, I am redoing the merge ...
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped