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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]

Hi all,

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

  mm/internal.h

between commit:

  ece1ed7bfa12 ("mm/gup: Add try_get_folio() and try_grab_folio()")

from the folio tree and commit:

  c5a8dccce9cd ("mm: handle uninitialized numa nodes gracefully")

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 mm/internal.h
index 293eca1360dc,dd42be01e628..000000000000
--- a/mm/internal.h
+++ b/mm/internal.h
@@@ -752,11 -713,6 +747,13 @@@ void vunmap_range_noflush(unsigned lon
  int numa_migrate_prep(struct page *page, struct vm_area_struct *vma,
  		      unsigned long addr, int page_nid, int *flags);
  
 +void free_zone_device_page(struct page *page);
 +
 +/*
 + * mm/gup.c
 + */
 +struct folio *try_grab_folio(struct page *page, int refs, unsigned int flags);
 +
+ DECLARE_PER_CPU(struct per_cpu_nodestat, boot_nodestats);
+ 
  #endif	/* __MM_INTERNAL_H */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]