Merge branch 'akpm' (patches from Andrew)

Browse source

Merge misc mm fixes from Andrew Morton:
 "7 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: memcontrol: fix percpu vmstats and vmevents flush
  mm, memcg: do not set reclaim_state on soft limit reclaim
  mailmap: add aliases for Dmitry Safonov
  mm/z3fold.c: fix lock/unlock imbalance in z3fold_page_isolate
  mm, memcg: partially revert "mm/memcontrol.c: keep local VM counters in sync with the hierarchical ones"
  mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n
  mm: memcontrol: flush percpu slab vmstats on kmem offlining

...

This commit is contained in:

Linus Torvalds 2019-08-31 08:31:48 -07:00

parent e0f14b8ca3 6c1c280805

commit 31bb5feb0d

6 changed files with 47 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

.mailmap

View file

5

include/linux/mmzone.h

View file

53

mm/memcontrol.c

View file

5

mm/vmscan.c

View file

1

mm/z3fold.c

View file

2

mm/zsmalloc.c

View file