Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton:
 "The rest of MM"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (101 commits)
  mm, compaction: simplify contended compaction handling
  mm, compaction: introduce direct compaction priority
  mm, thp: remove __GFP_NORETRY from khugepaged and madvised allocations
  mm, page_alloc: make THP-specific decisions more generic
  mm, page_alloc: restructure direct compaction handling in slowpath
  mm, page_alloc: don't retry initial attempt in slowpath
  mm, page_alloc: set alloc_flags only once in slowpath
  lib/stackdepot.c: use __GFP_NOWARN for stack allocations
  mm, kasan: switch SLUB to stackdepot, enable memory quarantine for SLUB
  mm, kasan: account for object redzone in SLUB's nearest_obj()
  mm: fix use-after-free if memory allocation failed in vma_adjust()
  zsmalloc: Delete an unnecessary check before the function call "iput"
  mm/memblock.c: fix index adjustment error in __next_mem_range_rev()
  mem-hotplug: alloc new page from a nearest neighbor node when mem-offline
  mm: optimize copy_page_to/from_iter_iovec
  mm: add cond_resched() to generic_swapfile_activate()
  Revert "mm, mempool: only set __GFP_NOMEMALLOC if there are free elements"
  mm, compaction: don't isolate PageWriteback pages in MIGRATE_SYNC_LIGHT mode
  mm: hwpoison: remove incorrect comments
  make __section_nr() more efficient
  ...

diff --combined mm/hugetlb.c
index 51a04e5e937351d6f138c91b211505f549e3bd5d,213ff90903a66602bd2486e62e84d960ad78011f..f904246a8fd5ae29d0d727f9eb1ccad6b9272cca
--- 1/mm/hugetlb.c
--- 2/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@@ -3316,7 -3316,7 +3316,7 @@@ static void unmap_ref_private(struct mm
        address = address & huge_page_mask(h);
        pgoff = ((address - vma->vm_start) >> PAGE_SHIFT) +
                        vma->vm_pgoff;
 -      mapping = file_inode(vma->vm_file)->i_mapping;
 +      mapping = vma->vm_file->f_mapping;
  
        /*
         * Take the mapping lock for the duration of the table walk. As
@@@ -4391,7 -4391,6 +4391,6 @@@ follow_huge_pud(struct mm_struct *mm, u
  
  /*
   * This function is called from memory failure code.
-  * Assume the caller holds page lock of the head page.
   */
  int dequeue_hwpoisoned_huge_page(struct page *hpage)
  {