Merge branch 'akpm' (patches from Andrew)

Browse source

Merge more fixes from Andrew Morton:
 "2 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm, vmscan: add cond_resched() into shrink_node_memcg()
  mm: workingset: fix NULL ptr in count_shadow_nodes

...

This commit is contained in:

Linus Torvalds 2016-12-02 18:48:11 -08:00

parent 8655639240 bd041733c9

commit 3c49de52d5

2 changed files with 3 additions and 1 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

mm/vmscan.c

View file

2

mm/workingset.c

View file