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

Yu Zhao
2024-09-09T07:29:41Z

On Mon, Sep 9, 2024 at 1:18 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the execve tree got a conflict in:
>
> include/linux/mm.h
>
> between commits:
>
> 99ab6f0a6854 ("mm/codetag: fix pgalloc_tag_split()")
> 4d42ecdbd2fb ("mm/codetag: add pgalloc_tag_copy()")
>
> from the mm-unstable branch of the mm tree and commit:
>
> 44f65d900698 ("binfmt_elf: mseal address zero")
>
> from the execve 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.

Thanks for the heads-up.

The conflict was trivial and your resolution looks good to me.