Re: linux-next: manual merge of the rust tree with the driver-core tree

Stephen Rothwell
2025-07-18T10:47:48Z

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]

Hi all,

On Fri, 18 Jul 2025 20:26:12 +1000 Stephen Rothwell <sfr@canb.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 ...