Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "12 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm, vmscan: prevent kswapd livelock due to pfmemalloc-throttled process being killed memcg: fix destination cgroup leak on task charges migration mm: memcontrol: switch soft limit default back to infinity mm/debug_pagealloc: remove obsolete Kconfig options vfs: renumber FMODE_NONOTIFY and add to uniqueness check arch/blackfin/mach-bf533/boards/stamp.c: add linux/delay.h ocfs2: fix the wrong directory passed to ocfs2_lookup_ino_from_name() when link file MAINTAINERS: update rydberg's addresses mm: protect set_page_dirty() from ongoing truncation mm: prevent endless growth of anon_vma hierarchy exit: fix race between wait_consider_task() and wait_task_zombie() ocfs2: remove bogus check in dlm_process_recovery_data
Showing
- .mailmap 1 addition, 0 deletions.mailmap
- MAINTAINERS 6 additions, 6 deletionsMAINTAINERS
- arch/blackfin/mach-bf533/boards/stamp.c 1 addition, 0 deletionsarch/blackfin/mach-bf533/boards/stamp.c
- fs/fcntl.c 3 additions, 2 deletionsfs/fcntl.c
- fs/ocfs2/dlm/dlmrecovery.c 1 addition, 4 deletionsfs/ocfs2/dlm/dlmrecovery.c
- fs/ocfs2/namei.c 35 additions, 8 deletionsfs/ocfs2/namei.c
- include/linux/fs.h 1 addition, 1 deletioninclude/linux/fs.h
- include/linux/rmap.h 10 additions, 0 deletionsinclude/linux/rmap.h
- include/linux/writeback.h 0 additions, 1 deletioninclude/linux/writeback.h
- include/uapi/asm-generic/fcntl.h 1 addition, 1 deletioninclude/uapi/asm-generic/fcntl.h
- kernel/exit.c 9 additions, 3 deletionskernel/exit.c
- mm/Kconfig.debug 0 additions, 9 deletionsmm/Kconfig.debug
- mm/memcontrol.c 4 additions, 13 deletionsmm/memcontrol.c
- mm/memory.c 17 additions, 10 deletionsmm/memory.c
- mm/page-writeback.c 12 additions, 31 deletionsmm/page-writeback.c
- mm/rmap.c 41 additions, 1 deletionmm/rmap.c
- mm/vmscan.c 13 additions, 11 deletionsmm/vmscan.c
Please register or sign in to comment