Merge branch 'akpm'
* akpm: mm: madvise(MADV_DODUMP): allow hugetlbfs pages ocfs2: fix locking for res->tracking and dlm->tracking_list mm/vmscan.c: fix int overflow in callers of do_shrink_slab() mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly mm/vmstat.c: fix outdated vmstat_text proc: restrict kernel stack dumps to root mm/hugetlb: add mmap() encodings for 32MB and 512MB page sizes mm/migrate.c: split only transparent huge pages when allocation fails ipc/shm.c: use ERR_CAST() for shm_lock() error return mm/gup_benchmark: fix unsigned comparison to zero in __gup_benchmark_ioctl mm, thp: fix mlocking THP page with migration enabled ocfs2: fix crash in ocfs2_duplicate_clusters_by_page() hugetlb: take PMD sharing into account when flushing tlb/caches mm: migration: fix migration of huge PMD shared pages
Showing
- fs/ocfs2/dlm/dlmmaster.c 2 additions, 2 deletionsfs/ocfs2/dlm/dlmmaster.c
- fs/ocfs2/refcounttree.c 12 additions, 4 deletionsfs/ocfs2/refcounttree.c
- fs/proc/base.c 14 additions, 0 deletionsfs/proc/base.c
- include/linux/hugetlb.h 14 additions, 0 deletionsinclude/linux/hugetlb.h
- include/linux/mm.h 6 additions, 0 deletionsinclude/linux/mm.h
- include/uapi/asm-generic/hugetlb_encode.h 2 additions, 0 deletionsinclude/uapi/asm-generic/hugetlb_encode.h
- include/uapi/linux/memfd.h 2 additions, 0 deletionsinclude/uapi/linux/memfd.h
- include/uapi/linux/mman.h 2 additions, 0 deletionsinclude/uapi/linux/mman.h
- include/uapi/linux/shm.h 2 additions, 0 deletionsinclude/uapi/linux/shm.h
- ipc/shm.c 1 addition, 1 deletionipc/shm.c
- mm/gup_benchmark.c 2 additions, 1 deletionmm/gup_benchmark.c
- mm/huge_memory.c 1 addition, 1 deletionmm/huge_memory.c
- mm/hugetlb.c 79 additions, 11 deletionsmm/hugetlb.c
- mm/madvise.c 1 addition, 1 deletionmm/madvise.c
- mm/migrate.c 4 additions, 1 deletionmm/migrate.c
- mm/rmap.c 39 additions, 3 deletionsmm/rmap.c
- mm/vmscan.c 3 additions, 4 deletionsmm/vmscan.c
- mm/vmstat.c 3 additions, 1 deletionmm/vmstat.c
Please register or sign in to comment