Merge branch 'akpm' (patches from Andrew)

Browse source

Merge misc fixes from Andrew Morton:
 "Five fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  pps: do not crash when failed to register
  tools/vm/slabinfo: fix an unintentional printf
  testing/radix-tree: fix a macro expansion bug
  radix-tree: fix radix_tree_iter_retry() for tagged iterators.
  mm: memcontrol: fix cgroup creation failure after many small jobs

...

This commit is contained in:

Linus Torvalds 2016-07-23 12:54:20 +09:00

parent d15ae814cc 368301f2fe

commit b1386cedda

7 changed files with 92 additions and 27 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

drivers/pps/clients/pps_parport.c

View file

25

include/linux/memcontrol.h

View file

1

include/linux/radix-tree.h

View file

82

mm/memcontrol.c

View file

4

mm/slab_common.c

View file

2

tools/testing/radix-tree/tag_check.c

View file

3

tools/vm/slabinfo.c

View file