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

[Suren Baghdasaryan]

On Mon, Oct 28, 2024 at 10:25 AM Catalin Marinas
<catalin.marinas@xxxxxxx> wrote:
>
> On Mon, Oct 28, 2024 at 11:10:58AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the arm64 tree got a conflict in:
> >
> >   include/linux/mm.h
> >
> > between commit:
> >
> >   e87ec503cf2e ("mm/codetag: uninline and move pgalloc_tag_copy and pgalloc_tag_split")
> >
> > from the mm-unstable branch of the mm tree and commit:
> >
> >   91e102e79740 ("prctl: arch-agnostic prctl for shadow stack")
> >
> > from the arm64 tree.
> >
> > I fixed it up (see below) 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.
>
> This looks fine. Thanks.

Looks valid to me too. Thanks!

>
> --
> Catalin