Linux / linux / bec8b6e / Merge branch 'akpm' (patches from Andrew)

Linux/linux bec8b6e — drivers/base memory.c, include/linux memory.h

2019-11-16 16:20:43 UTC by Linus Torvalds on ⎇

master

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 at 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

Delta		File
+28	-17	mm/memory_hotplug.c
+9	-30	mm/slub.c
+36	-0	drivers/base/memory.c
+17	-14	mm/debug.c
+16	-12	mm/khugepaged.c
+12	-4	mm/madvise.c
+9	-5	mm/mempolicy.c
+3	-3	mm/page_io.c
+1	-1	mm/memcontrol.c
+1	-1	mm/hugetlb_cgroup.c
+1	-0	lib/xz/xz_dec_lzma2.c
+1	-0	include/linux/memory.h
+134	-87	12 files

Unified Split Raw