• Linus Torvalds's avatar
    Merge branch 'akpm' (patches from Andrew) · aefbef10
    Linus Torvalds authored
    Merge first patchbomb from Andrew Morton:
     - a few misc things
     - ocfs2 udpates
     - kernel/watchdog.c feature work (took ages to get right)
     - most of MM.  A few tricky bits are held up and probably won't make 4.2.
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (91 commits)
      mm: kmemleak_alloc_percpu() should follow the gfp from per_alloc()
      mm, thp: respect MPOL_PREFERRED policy with non-local node
      tmpfs: truncate prealloc blocks past i_size
      mm/memory hotplug: print the last vmemmap region at the end of hot add memory
      mm/mmap.c: optimization of do_mmap_pgoff function
      mm: kmemleak: optimise kmemleak_lock acquiring during kmemleak_scan
      mm: kmemleak: avoid deadlock on the kmemleak object insertion error path
      mm: kmemleak: do not acquire scan_mutex in kmemleak_do_cleanup()
      mm: kmemleak: fix delete_object_*() race when called on the same memory block
      mm: kmemleak: allow safe memory scanning during kmemleak disabling
      memcg: convert mem_cgroup->under_oom from atomic_t to int
      memcg: remove unused mem_cgroup->oom_wakeups
      frontswap: allow multiple backends
      x86, mirror: x86 enabling - find mirrored memory ranges
      mm/memblock: allocate boot time data structures from mirrored memory
      mm/memblock: add extra "flags" to memblock to allow selection of memory based on attribute
      mm: do not ignore mapping_gfp_mask in page cache allocation paths
      mm/cma.c: fix typos in comments
      mm/oom_kill.c: print points as unsigned int
      mm/hugetlb: handle races in alloc_huge_page and hugetlb_reserve_pages
page_alloc.c 184 KB