Re: linux-next: manual merge of the char-misc tree with the rust tree

[Miguel Ojeda]

On Tue, Oct 20, 2026 at 2:27 PM Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
>   drivers/android/binder/thread.rs
>
> between commit:
>
>   a12f22b2c9398 ("rust_binder: use pr_*_ratelimited! for printing")
>
> from the rust tree and commit:
>
>   985955d8e6b2b ("rust_binder: wake epoll on self-work queued to poll thread")
>
> from the char-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks fine, thanks!

Cheers,
Miguel