Re: [PATCH v9 2/2] rust: xarray: Add an abstraction for XArray

[Miguel Ojeda]

On Tue, Nov 19, 2024 at 7:22 PM Tamir Duberstein <tamird@xxxxxxxxx> wrote:
>
> Looks like there are merge conflicts between v6.13 and rust-next.
> What's the usual process for resolution?

You can take a look, for instance, at how it was done in linux-next.

(Nit: mainline is not yet v6.13)

Cheers,
Miguel