Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "11 fixes" MM fixes and one xz decompressor fix. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm/debug.c: PageAnon() is true for PageKsm() pages mm/debug.c: __dump_page() prints an extra line mm/page_io.c: do not free shared swap slots mm/memory_hotplug: fix try_offline_node() mm,thp: recheck each page before collapsing file THP mm: slub: really fix slab walking for init_on_free mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() lib/xz: fix XZ_DYNALLOC to avoid useless memory reallocations mm: fix trying to reclaim unevictable lru page when calling madvise_pageout mm: mempolicy: fix the wrong return value and potential pages leak of mbind
Showing
- drivers/base/memory.c 36 additions, 0 deletionsdrivers/base/memory.c
- include/linux/memory.h 1 addition, 0 deletionsinclude/linux/memory.h
- lib/xz/xz_dec_lzma2.c 1 addition, 0 deletionslib/xz/xz_dec_lzma2.c
- mm/debug.c 17 additions, 14 deletionsmm/debug.c
- mm/hugetlb_cgroup.c 1 addition, 1 deletionmm/hugetlb_cgroup.c
- mm/khugepaged.c 16 additions, 12 deletionsmm/khugepaged.c
- mm/madvise.c 12 additions, 4 deletionsmm/madvise.c
- mm/memcontrol.c 1 addition, 1 deletionmm/memcontrol.c
- mm/memory_hotplug.c 27 additions, 16 deletionsmm/memory_hotplug.c
- mm/mempolicy.c 9 additions, 5 deletionsmm/mempolicy.c
- mm/page_io.c 3 additions, 3 deletionsmm/page_io.c
- mm/slub.c 9 additions, 30 deletionsmm/slub.c
Please register or sign in to comment