Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "11 mm fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm: khugepaged: add trace status description for SCAN_PAGE_HAS_PRIVATE mm: memcg/slab: call flush_memcg_workqueue() only if memcg workqueue is valid mm/page-writeback.c: improve arithmetic divisions mm/page-writeback.c: use div64_ul() for u64-by-unsigned-long divide mm/page-writeback.c: avoid potential division by zero in wb_min_max_ratio() mm, debug_pagealloc: don't rely on static keys too early mm: memcg/slab: fix percpu slab vmstats flushing mm/shmem.c: thp, shmem: fix conflict of above-47bit hint address and PMD alignment mm/huge_memory.c: thp: fix conflict of above-47bit hint address and PMD alignment mm/memory_hotplug: don't free usage map when removing a re-added early section mm, thp: tweak reclaim/compaction effort of local-only and all-node allocations
No related branches found
No related tags found
Showing
- include/linux/mm.h 15 additions, 3 deletionsinclude/linux/mm.h
- include/linux/mmzone.h 2 additions, 3 deletionsinclude/linux/mmzone.h
- include/trace/events/huge_memory.h 2 additions, 1 deletioninclude/trace/events/huge_memory.h
- init/main.c 1 addition, 0 deletionsinit/main.c
- mm/huge_memory.c 24 additions, 14 deletionsmm/huge_memory.c
- mm/memcontrol.c 9 additions, 28 deletionsmm/memcontrol.c
- mm/mempolicy.c 7 additions, 3 deletionsmm/mempolicy.c
- mm/page-writeback.c 5 additions, 5 deletionsmm/page-writeback.c
- mm/page_alloc.c 18 additions, 43 deletionsmm/page_alloc.c
- mm/shmem.c 4 additions, 3 deletionsmm/shmem.c
- mm/slab.c 2 additions, 2 deletionsmm/slab.c
- mm/slab_common.c 2 additions, 1 deletionmm/slab_common.c
- mm/slub.c 1 addition, 1 deletionmm/slub.c
- mm/sparse.c 8 additions, 1 deletionmm/sparse.c
- mm/vmalloc.c 2 additions, 2 deletionsmm/vmalloc.c
Loading
Please register or sign in to comment