Skip to content
  • Linus Torvalds's avatar
    Merge branch 'akpm' (patches from Andrew) · bc49a783
    Linus Torvalds authored
    Merge updates from Andrew Morton:
     "142 patches:
    
       - DAX updates
    
       - various misc bits
    
       - OCFS2 updates
    
       - most of MM"
    
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (142 commits)
      mm/z3fold.c: limit first_num to the actual range of possible buddy indexes
      mm: fix <linux/pagemap.h> stray kernel-doc notation
      zram: remove obsolete sysfs attrs
      mm/memblock.c: remove unnecessary log and clean up
      oom-reaper: use madvise_dontneed() logic to decide if unmap the VMA
      mm: drop unused argument of zap_page_range()
      mm: drop zap_details::check_swap_entries
      mm: drop zap_details::ignore_dirty
      mm, page_alloc: warn_alloc nodemask is NULL when cpusets are disabled
      mm: help __GFP_NOFAIL allocations which do not trigger OOM killer
      mm, oom: do not enforce OOM killer for __GFP_NOFAIL automatically
      mm: consolidate GFP_NOFAIL checks in the allocator slowpath
      lib/show_mem.c: teach show_mem to work with the given nodemask
      arch, mm: remove arch specific show_mem
      mm, page_alloc: warn_alloc print nodemask
      mm, page_alloc: do not report all nodes in show_mem
      Revert "mm: bail out in shrink_inactive_list()"
      mm, vmscan: consider eligible zones in get_scan_count
      mm, vmscan: cleanup lru size claculations
      mm, vmscan: do not count freed pages as PGDEACTIVATE
      ...
    bc49a783