Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Sep 2016 23:20:24 +0000 (16:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Sep 2016 23:20:24 +0000 (16:20 -0700)
commit53061afee43bc5041b67a45b6d793e7afdcf9ca7
treeed7e918bd7323ded4bdd899aded6384488dad9a4
parentae6dd8d61913b5341067c7c660e8e91430d22e7c
parent231e97e2b8ec9a1556ced5d8a89cda03a480b179
Merge branch 'akpm' (patches from Andrew)

Merge fixes from Andrew Morton:
 "4 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mem-hotplug: use nodes that contain memory as mask in new_node_page()
  scripts/recordmcount.c: account for .softirqentry.text
  dma-mapping.h: preserve unmap info for CONFIG_DMA_API_DEBUG
  mm,ksm: fix endless looping in allocating memory when ksm enable