2015-05-28-15-39 merged

Andrea Arcangeli (2):
      userfaultfd: cleanup superfluous _irq locking
      userfaultfd: update the uffd_msg structure to be the same on 32/64bit

Andrew Morton (1):
      userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2-fix

Dominik Dingel (5):
      s390/mm: make hugepages_supported a boot time decision
      mm/hugetlb: remove unused arch hook prepare/release_hugepage
      mm/hugetlb: remove arch_prepare/release_hugepage from arch headers
      s390/hugetlb: remove dead code for sw emulated huge pages
      s390/mm: forward check for huge pmds to pmd_large()

Fabian Frederick (2):
      fs/ufs: revert "ufs: fix deadlocks introduced by sb mutex merge"
      fs/ufs: restore s_lock mutex

Gu Zheng (1):
      mm/memory_hotplug.c: set zone->wait_table to null after freeing it

Michal Hocko (4):
      Reverted "mm-hugetlb-handle-races-in-alloc_huge_page-and-hugetlb_reserve_pages-fix"
      Reverted "mm/hugetlb: handle races in alloc_huge_page and hugetlb_reserve_pages"
      Reverted "mm/hugetlb: compute/return the number of regions added by region_add()"
      Documentation/vm/unevictable-lru.txt: clarify MAP_LOCKED behavior

Mike Kravetz (3):
      mm/hugetlb: document the reserve map/region tracking routines
      mm/hugetlb: compute/return the number of regions added by region_add()
      mm/hugetlb: handle races in alloc_huge_page and hugetlb_reserve_pages

Sergey Senozhatsky (2):
      zram: check comp algorithm availability earlier
      zram-check-comp-algorithm-availability-earlier-v2

Shailendra Verma (1):
      mm/cma.c: fix typos in comments

Stephen Rothwell (1):
      userfaultfd: activate syscall fix

Vladimir Davydov (1):
      memcg: do not call reclaim if !__GFP_WAIT

Wang Long (1):
      mm/oom_kill.c: print points as unsigned int
zram-check-comp-algorithm-availability-earlier-v2

Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Marcin Jabrzyk <m.jabrzyk@samsung.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2 files changed