Re: linux-next: manual merge of the rust tree with the vfs-brauner, driver-core trees

[Miguel Ojeda]

On Tue, Jul 15, 2025 at 10:09 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   rust/helpers/helpers.c
>
> between commits:
>
>   6efbf978891b ("poll: rust: allow poll_table ptrs to be null")
>   a2801affa710 ("rust: device: Create FwNode abstraction for accessing device properties")
>
> from the vfs-brauner, driver-core trees and commit:
>
>   8ffb945647f8 ("rust: helpers: sort includes alphabetically")
>
> from the rust tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good, thanks!

Cheers,
Miguel