linux-next: manual merge of the akpm-current tree with the folio tree

[Stephen Rothwell]

Hi all,

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

  mm/mempolicy.c

between commit:

  ec4858e07ed6 ("mm/mempolicy: Use vma_alloc_folio() in new_page()")

from the folio tree and commit:

  c5b406e86042 ("mm: migrate: use thp_order instead of HPAGE_PMD_ORDER for new page allocation.")

from the akpm-current tree.

I fixed it up (I just ued the former change) 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: pgpr1n0AzugIh.pgp
Description: OpenPGP digital signature