Merge branch 'akpm' (patches from Andrew)
Merge more fixes from Andrew Morton: "17 fixes" Mostly mm fixes and one ocfs2 locking fix. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm: memcontrol: fix network errors from failing __GFP_ATOMIC charges mm/memory_hotplug: fix updating the node span scripts/gdb: fix debugging modules compiled with hot/cold partitioning mm: slab: make page_cgroup_ino() to recognize non-compound slab pages properly MAINTAINERS: update information for "MEMORY MANAGEMENT" dump_stack: avoid the livelock of the dump_lock zswap: add Vitaly to the maintainers list mm/page_alloc.c: ratelimit allocation failure warnings more aggressively mm/khugepaged: fix might_sleep() warn with CONFIG_HIGHPTE=y mm, vmstat: reduce zone->lock holding time by /proc/pagetypeinfo mm, vmstat: hide /proc/pagetypeinfo from normal users mm/mmu_notifiers: use the right return code for WARN_ON ocfs2: protect extent tree in ocfs2_prepare_inode_for_write() mm: thp: handle page cache THP correctly in PageTransCompoundMap mm, meminit: recalculate pcpu batch and high limits after init completes mm/gup_benchmark: fix MAP_HUGETLB case mm: memcontrol: fix NULL-ptr deref in percpu stats flush
Showing
- MAINTAINERS 5 additions, 0 deletionsMAINTAINERS
- fs/ocfs2/file.c 90 additions, 44 deletionsfs/ocfs2/file.c
- include/linux/mm.h 0 additions, 5 deletionsinclude/linux/mm.h
- include/linux/mm_types.h 5 additions, 0 deletionsinclude/linux/mm_types.h
- include/linux/page-flags.h 18 additions, 2 deletionsinclude/linux/page-flags.h
- lib/dump_stack.c 6 additions, 1 deletionlib/dump_stack.c
- mm/khugepaged.c 4 additions, 3 deletionsmm/khugepaged.c
- mm/memcontrol.c 16 additions, 7 deletionsmm/memcontrol.c
- mm/memory_hotplug.c 8 additions, 0 deletionsmm/memory_hotplug.c
- mm/mmu_notifier.c 1 addition, 1 deletionmm/mmu_notifier.c
- mm/page_alloc.c 9 additions, 8 deletionsmm/page_alloc.c
- mm/slab.h 2 additions, 2 deletionsmm/slab.h
- mm/vmstat.c 21 additions, 4 deletionsmm/vmstat.c
- scripts/gdb/linux/symbols.py 2 additions, 1 deletionscripts/gdb/linux/symbols.py
- tools/testing/selftests/vm/gup_benchmark.c 1 addition, 1 deletiontools/testing/selftests/vm/gup_benchmark.c
Loading
Please register or sign in to comment