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

Miguel Ojeda <[email protected]> Mon, 10 Aug 2026 23:25:04 +0200

Newsgroups	org.kernel.vger.linux-next,org.kernel.vger.linux-kernel
Message-ID	<CANiq72m+J4DA54p9=REf+ZJwRLbPe9eHonXx766HBQ7S=9aB-g@mail.gmail.com>

On Mon, Aug 10, 2026 at 6:58 PM Mark Brown <[email protected]> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
>   rust/kernel/sync/rcu.rs
>
> between commit:
>
>   d8973c4754437 ("rust: sync: Add abstraction for rcu_barrier()")
>
> from the rust tree and commit:
>
>   1fb92e0625596 ("rust: sync: Add abstraction for synchronize_rcu()")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good, of course, thanks Mark!

Cheers,
Miguel