Merge branch 'akpm' (patches from Andrew)

Merge updates from Andrew Morton:

 - various misc bits

 - DAX updates

 - OCFS2

 - most of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (119 commits)
  mm,fork: introduce MADV_WIPEONFORK
  x86,mpx: make mpx depend on x86-64 to free up VMA flag
  mm: add /proc/pid/smaps_rollup
  mm: hugetlb: clear target sub-page last when clearing huge page
  mm: oom: let oom_reap_task and exit_mmap run concurrently
  swap: choose swap device according to numa node
  mm: replace TIF_MEMDIE checks by tsk_is_oom_victim
  mm, oom: do not rely on TIF_MEMDIE for memory reserves access
  z3fold: use per-cpu unbuddied lists
  mm, swap: don't use VMA based swap readahead if HDD is used as swap
  mm, swap: add sysfs interface for VMA based swap readahead
  mm, swap: VMA based swap readahead
  mm, swap: fix swap readahead marking
  mm, swap: add swap readahead hit statistics
  mm/vmalloc.c: don't reinvent the wheel but use existing llist API
  mm/vmstat.c: fix wrong comment
  selftests/memfd: add memfd_create hugetlbfs selftest
  mm/shmem: add hugetlbfs support to memfd_create()
  mm, devm_memremap_pages: use multi-order radix for ZONE_DEVICE lookups
  mm/vmalloc.c: halve the number of comparisons performed in pcpu_get_vm_areas()
  ...

diff --cc fs/ext4/file.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ocfs2/file.c
Simple merge

diff --cc fs/sync.c
index 27d6b8bbcb6a51d3f5987079b32b9c89754c7489,cf57f33fcd160f358945632a3dd87419684e8e3f..2e3fd7d94d2df97b3d4cbb8f25dfc0f9089b8a2b
--- 1/fs/sync.c
--- 2/fs/sync.c
+++ b/fs/sync.c
@@@ -335,14 -335,9 +335,9 @@@ SYSCALL_DEFINE4(sync_file_range, int, f
                goto out_put;
  
        mapping = f.file->f_mapping;
-       if (!mapping) {
-               ret = -EINVAL;
-               goto out_put;
-       }
- 
        ret = 0;
        if (flags & SYNC_FILE_RANGE_WAIT_BEFORE) {
 -              ret = filemap_fdatawait_range(mapping, offset, endbyte);
 +              ret = file_fdatawait_range(f.file, offset, endbyte);
                if (ret < 0)
                        goto out_put;
        }

diff --cc fs/xfs/xfs_file.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc mm/filemap.c
Simple merge