2017-04-11-15-23 merged

Andrew Morton (1):
      mm-page_alloc-re-enable-softirq-use-of-per-cpu-page-allocator-checkpatch-fixes

Anshuman Khandual (2):
      mm/madvise.c: clean up MADV_SOFT_OFFLINE and MADV_HWPOISON
      mm/memory-failure.c: add page flag description in error paths

Jesper Dangaard Brouer (1):
      mm, page_alloc: re-enable softirq use of per-cpu page allocator

Michal Hocko (22):
      Reverted "hmm: heterogeneous memory management documentation"
      Reverted "mm/hmm/devmem: dummy HMM device for ZONE_DEVICE memory"
      Reverted "mm-hmm-devmem-device-memory-hotplug-using-zone_device-fix"
      Reverted "mm/hmm/devmem: device memory hotplug using ZONE_DEVICE"
      Reverted "mm/migrate: allow migrate_vma() to alloc new page on empty entry"
      Reverted "mm/migrate: support un-addressable ZONE_DEVICE page in migration"
      Reverted "mm/hmm/mirror: device page fault handler"
      Reverted "mm/hmm/mirror: helper to snapshot CPU page table"
      Reverted "mm/hmm/mirror: mirror process address space on device with HMM helpers"
      Reverted "mm/hmm: heterogeneous memory management (HMM for short)"
      Reverted "mm/migrate: migrate_vma() unmap page from vma while collecting pages"
      Reverted "mm/migrate: new memory migration helper for use with device memory"
      Reverted "mm/migrate: new migrate mode MIGRATE_SYNC_NO_COPY"
      Reverted "mm/ZONE_DEVICE/x86: add support for un-addressable device memory"
      Reverted "mm/unaddressable-memory: new type of ZONE_DEVICE for unaddressable memory"
      Reverted "mm/put_page: move ZONE_DEVICE page reference decrement v2"
      Reverted "mm/memory/hotplug: add memory type parameter to arch_add/remove_memory"
      Reverted "zram: handle multiple pages attached to bio's bvec"
      Reverted "zram: introduce zram data accessor"
      Reverted "zram: remove zram_meta structure"
      Reverted "zram: use zram_slot_lock instead of raw bit_spin_lock op"
      Reverted "zram: partial IO refactoring"

Minchan Kim (1):
      mm: remove PG_Mlocked VM_BUG_ON check

Oliver O'Halloran (2):
      mm/huge_memory.c.c: use zap_deposited_table() more
      mm/huge_memory.c: deposit a pgtable for DAX PMD faults when required

Pushkar Jambhlekar (1):
      drivers/dax/dax.c: avoid potential deadlock

Tetsuo Handa (1):
      mm, page_alloc: remove debug_guardpage_minorder() test in warn_alloc()

Vitaly Wool (1):
      z3fold: fix page locking in z3fold_alloc()
mm/huge_memory.c: deposit a pgtable for DAX PMD faults when required

Although all architectures use a deposited page table for THP on anonymous VMAs
some architectures (s390 and powerpc) require the deposited storage even for
file backed VMAs due to quirks of their MMUs. This patch adds support for
depositing a table in DAX PMD fault handling path for archs that require it.
Other architectures should see no functional changes.

Link: http://lkml.kernel.org/r/20170411174233.21902-3-oohall@gmail.com
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Cc: Reza Arbab <arbab@linux.vnet.ibm.com>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: linux-nvdimm@ml01.01.org
Cc: Oliver O'Halloran <oohall@gmail.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 file changed