Re: linux-next: manual merge of the rust-fixes tree with the origin tree

[Miguel Ojeda]

On Fri, Oct 23, 2026 at 4:00 PM Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> Today's linux-next merge of the rust-fixes tree got a conflict in:
>
>   rust/bindgen_parameters
>
> between commit:
>
>   bc6f2a284c633 ("rust: fwctl: declare cfi_encoding for fwctl_rpc_scope")
>
> from the origin tree and commits:
>
>   01f3e6b4b1c8c ("rust: irq: declare cfi_encoding for irqreturn")
>   39fe6892fd52f ("rust: hrtimer: declare cfi_encoding for hrtimer_restart")
>   7d109178cd644 ("rust: dma: declare cfi_encoding for dma_data_direction")
>
> from the rust-fixes tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good, thanks!

Cheers,
Miguel