Merge branch 'akpm' (patches from Andrew)

Browse source

Merge fixes from Andrew Morton:
 "7 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/memory_hotplug.c: initialize per_cpu_nodestats for hotadded pgdats
  mm, oom: fix uninitialized ret in task_will_free_mem()
  kasan: remove the unnecessary WARN_ONCE from quarantine.c
  mm: memcontrol: fix memcg id ref counter on swap charge move
  mm: memcontrol: fix swap counter leak on swapout from offline cgroup
  proc, meminfo: use correct helpers for calculating LRU sizes in meminfo
  mm/hugetlb: fix incorrect hugepages count during mem hotplug

...

This commit is contained in:

Linus Torvalds 2016-08-11 16:58:24 -07:00

parent d3396e1e4e 5830169f47

commit 4b9eaf33d8

7 changed files with 64 additions and 20 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

2

fs/proc/meminfo.c

View file

1

mm/hugetlb.c

View file

7

mm/kasan/quarantine.c

View file

72

mm/memcontrol.c

View file

2

mm/memory_hotplug.c

View file

2

mm/oom_kill.c

View file

2

mm/page_alloc.c

View file