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

From: Catalin Marinas
Date: Mon Mar 22 2021 - 14:04:09 EST

On Mon, Mar 22, 2021 at 05:40:23PM +1100, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the akpm tree got a conflict in:
> arch/arm64/mm/mmu.c
> between commit:
> 87143f404f33 ("arm64: mm: use XN table mapping attributes for the linear region")
> from the arm64 tree and commit:
> 0a2634348ef8 ("set_memory: allow querying whether set_direct_map_*() is actually enabled")
> from the akpm 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.

The resolution looks fine. Thanks Stephen.