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

[Stephen Rothwell]

Hi all,

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

  include/linux/memremap.h

between commit:

  6869b7b20659 ("memremap: provide a not device managed memremap_pages")

from the hmm tree and commit:

  1ed60e3c73e6 ("/proc/kpageflags: do not use uninitialized struct pages")

from the akpm-current 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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/memremap.h
index bef51e35d8d2,2cfc3c289d01..000000000000
--- a/include/linux/memremap.h
+++ b/include/linux/memremap.h
@@@ -122,8 -124,7 +122,9 @@@ static inline struct vmem_altmap *pgmap
  }
  
  #ifdef CONFIG_ZONE_DEVICE
+ bool pfn_zone_device_reserved(unsigned long pfn);
 +void *memremap_pages(struct dev_pagemap *pgmap, int nid);
 +void memunmap_pages(struct dev_pagemap *pgmap);
  void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap);
  void devm_memunmap_pages(struct device *dev, struct dev_pagemap *pgmap);
  struct dev_pagemap *get_dev_pagemap(unsigned long pfn,

Attachment: pgpcN2Qsl1pmf.pgp
Description: OpenPGP digital signature