Merge branch 'akpm' (patches from Andrew)

Merge updates from Andrew Morton:

 - a few misc bits

 - ocfs2

 - most(?) of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (125 commits)
  thp: fix comments of __pmd_trans_huge_lock()
  cgroup: remove unnecessary 0 check from css_from_id()
  cgroup: fix idr leak for the first cgroup root
  mm: memcontrol: fix documentation for compound parameter
  mm: memcontrol: remove BUG_ON in uncharge_list
  mm: fix build warnings in <linux/compaction.h>
  mm, thp: convert from optimistic swapin collapsing to conservative
  mm, thp: fix comment inconsistency for swapin readahead functions
  thp: update Documentation/{vm/transhuge,filesystems/proc}.txt
  shmem: split huge pages beyond i_size under memory pressure
  thp: introduce CONFIG_TRANSPARENT_HUGE_PAGECACHE
  khugepaged: add support of collapse for tmpfs/shmem pages
  shmem: make shmem_inode_info::lock irq-safe
  khugepaged: move up_read(mmap_sem) out of khugepaged_alloc_page()
  thp: extract khugepaged from mm/huge_memory.c
  shmem, thp: respect MADV_{NO,}HUGEPAGE for file mappings
  shmem: add huge pages support
  shmem: get_unmapped_area align huge page
  shmem: prepare huge= mount option and sysfs knob
  mm, rmap: account shmem thp pages
  ...

diff --cc Makefile
Simple merge

diff --cc arch/s390/mm/fault.c
Simple merge

diff --cc drivers/block/zram/zram_drv.c
Simple merge

diff --cc fs/btrfs/extent_io.c
Simple merge

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

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

diff --cc fs/f2fs/data.c
Simple merge

diff --cc fs/mpage.c
Simple merge

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

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

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

diff --cc mm/hugetlb.c
Simple merge