linux-next: manual merge of the rust tree with the mm-stable tree

linux-next: manual merge of the rust tree with the mm-stable tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 782 bytes --]

Hi all,

Today's linux-next merge of the rust tree got a conflict in:

  rust/kernel/task.rs

between commit:

  6acb75ad7b9e ("task: rust: rework how current is accessed")

from the mm-stable tree and commit:

  f54c75033338 ("rust: task: add missing Markdown code spans and intra-doc links")

from the rust tree.

I fixed it up (the former removes the lines updated by the latter) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Miguel Ojeda]

On Mon, May 26, 2025 at 9:37 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I fixed it up (the former removes the lines updated by the latter) and

Looks good, thanks!

Cheers,
Miguel