tree 3d3bb4ca9c5fe7372eb499bf9983d514ec2f5477
parent 5b697f86f9f136d200c9827d6eca0437b7eb96cf
parent 4aab2be0983031a05cb4a19696c9da5749523426
author Linus Torvalds <torvalds@linux-foundation.org> 1602440284 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1602440284 -0700

Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "Five fixes.

  Subsystems affected by this patch series: MAINTAINERS, mm/pagemap,
  mm/swap, and mm/hugetlb"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged
  mm: validate inode in mapping_set_error()
  mm: mmap: Fix general protection fault in unlink_file_vma()
  MAINTAINERS: Antoine Tenart's email address
  MAINTAINERS: change hardening mailing list