Merge branch 'akpm' (incoming from Andrew)

Browse source

Merge misc fixes from Andrew Morton:
 "9 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  MAINTAINERS: add closing angle bracket to Vince Bridgers' email address
  Documentation: fix DOCBOOKS=... building
  ocfs2: fix double kmem_cache_destroy in dlm_init
  mm/memory-failure.c: fix memory leak by race between poison and unpoison
  wait: swap EXIT_ZOMBIE(Z) and EXIT_DEAD(X) chars in TASK_STATE_TO_CHAR_STR
  memcg: fix swapcache charge from kernel thread context
  mm: madvise: fix MADV_WILLNEED on shmem swapouts
  mm/filemap.c: avoid always dirtying mapping->flags on O_DIRECT
  hwpoison, hugetlb: lock_page/unlock_page does not match for handling a free hugepage

...

This commit is contained in:

Linus Torvalds 2014-05-23 09:38:07 -07:00

parent 9abd09acd6 0d9327ab70

commit fc3ac5c75b

8 changed files with 38 additions and 28 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

Documentation/DocBook/media/Makefile

View file

2

MAINTAINERS

View file

8

fs/ocfs2/dlm/dlmmaster.c

View file

2

include/linux/sched.h

View file

6

mm/filemap.c

View file

2

mm/madvise.c

View file

27

mm/memcontrol.c

View file

17

mm/memory-failure.c

View file