linux-next: manual merge of the folio tree with the asm-generic tree

[Stephen Rothwell]

Hi all,

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

  arch/nds32/include/asm/pgtable.h

between commit:

  9f15ac318b83 ("nds32: Remove the architecture")

from the asm-generic tree and commit:

  e558a885a525 ("arch: Add pmd_pfn() where it is missing")

from the folio tree.

I fixed it up (I just deleted the file) 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: pgp68CwuGuk7M.pgp
Description: OpenPGP digital signature