7 fixes, based on 846d2db3e00048da3f650e0cfb0b8d67669cec3e:
Roman Gushchin <guro@xxxxxx>:
mm: memcontrol: flush percpu slab vmstats on kmem offlining
Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>:
mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n
Roman Gushchin <guro@xxxxxx>:
mm, memcg: partially revert "mm/memcontrol.c: keep local VM counters in sync with the hierarchical ones"
"Gustavo A. R. Silva" <gustavo@xxxxxxxxxxxxxx>:
mm/z3fold.c: fix lock/unlock imbalance in z3fold_page_isolate
Dmitry Safonov <dima@xxxxxxxxxx>:
mailmap: add aliases for Dmitry Safonov
Michal Hocko <mhocko@xxxxxxxx>:
mm, memcg: do not set reclaim_state on soft limit reclaim
Shakeel Butt <shakeelb@xxxxxxxxxx>:
mm: memcontrol: fix percpu vmstats and vmevents flush
.mailmap | 3 ++
include/linux/mmzone.h | 5 ++--
mm/memcontrol.c | 53 ++++++++++++++++++++++++++++++++-----------------
mm/vmscan.c | 5 ++--
mm/z3fold.c | 1
mm/zsmalloc.c | 2 +
6 files changed, 47 insertions(+), 22 deletions(-)
