Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "17 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: MIPS: fix DMA contiguous allocation sh64: fix __NR_fgetxattr ocfs2: fix SGID not inherited issue mm/oom_kill.c: avoid attempting to kill init sharing same memory drivers/base/memory.c: prohibit offlining of memory blocks with missing sections tmpfs: fix shmem_evict_inode() warnings on i_blocks mm/hugetlb.c: fix resv map memory leak for placeholder entries mm: hugetlb: call huge_pte_alloc() only if ptep is null kernel: remove stop_machine() Kconfig dependency mm: kmemleak: mark kmemleak_init prototype as __init mm: fix kerneldoc on mem_cgroup_replace_page osd fs: __r4w_get_page rely on PageUptodate for uptodate MAINTAINERS: make Vladimir co-maintainer of the memory controller mm, vmstat: allow WQ concurrency to discover memory reclaim doesn't make any progress mm: fix swapped Movable and Reclaimable in /proc/pagetypeinfo memcg: fix memory.high target mm: hugetlb: fix hugepage memory leak caused by wrong reserve count
Showing
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- arch/mips/mm/dma-default.c 1 addition, 1 deletionarch/mips/mm/dma-default.c
- arch/sh/include/uapi/asm/unistd_64.h 1 addition, 1 deletionarch/sh/include/uapi/asm/unistd_64.h
- drivers/base/memory.c 4 additions, 0 deletionsdrivers/base/memory.c
- fs/exofs/inode.c 1 addition, 4 deletionsfs/exofs/inode.c
- fs/nfs/objlayout/objio_osd.c 1 addition, 4 deletionsfs/nfs/objlayout/objio_osd.c
- fs/ocfs2/namei.c 1 addition, 3 deletionsfs/ocfs2/namei.c
- include/linux/kmemleak.h 1 addition, 1 deletioninclude/linux/kmemleak.h
- include/linux/stop_machine.h 3 additions, 3 deletionsinclude/linux/stop_machine.h
- init/Kconfig 0 additions, 7 deletionsinit/Kconfig
- kernel/stop_machine.c 2 additions, 2 deletionskernel/stop_machine.c
- mm/backing-dev.c 16 additions, 3 deletionsmm/backing-dev.c
- mm/hugetlb.c 20 additions, 7 deletionsmm/hugetlb.c
- mm/memcontrol.c 2 additions, 2 deletionsmm/memcontrol.c
- mm/oom_kill.c 2 additions, 0 deletionsmm/oom_kill.c
- mm/page_alloc.c 2 additions, 1 deletionmm/page_alloc.c
- mm/shmem.c 14 additions, 20 deletionsmm/shmem.c
- mm/vmstat.c 5 additions, 3 deletionsmm/vmstat.c
Loading
Please register or sign in to comment