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

[Huang, Ying]

Hi, Stephen,

Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes:

> Hi all,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
>   mm/memory.c
>
> between commit:
>
>   b08b123ead1a ("mm: avoid unnecessary use of is_swap_pmd()")
>
> from the mm-unstable tree and commit:
>
>   79301c7d605a ("mm: add spurious fault fixing support for huge pmd")
>
> from the arm64 tree.
>
> I fixed it up (I think - 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 fix looks right to me.  Thanks!

---
Best Regards,
Huang, Ying