Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Aug 2017 01:02:27 +0000 (18:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Aug 2017 01:02:27 +0000 (18:02 -0700)
commitb3242dba9ff285962fe84d1135cafe9383d721f0
treecf4399b9a45bca863a0b404bfc7edfeff670ab1e
parent67a3b5cb33633f39db8809ae56c8c1752b541daa
parent91b540f98872a206ea1c49e4aa6ea8eed0886644
Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "6 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/memblock.c: reversed logic in memblock_discard()
  fork: fix incorrect fput of ->exe_file causing use-after-free
  mm/madvise.c: fix freeing of locked page with MADV_FREE
  dax: fix deadlock due to misaligned PMD faults
  mm, shmem: fix handling /sys/kernel/mm/transparent_hugepage/shmem_enabled
  PM/hibernate: touch NMI watchdog when creating snapshot