Merge branch 'akpm' into master (patches from Andrew)
Merge misc fixes from Andrew Morton: "Subsystems affected by this patch series: mm/pagemap, mm/shmem, mm/hotfixes, mm/memcg, mm/hugetlb, mailmap, squashfs, scripts, io-mapping, MAINTAINERS, and gdb" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: scripts/gdb: fix lx-symbols 'gdb.error' while loading modules MAINTAINERS: add KCOV section io-mapping: indicate mapping failure scripts/decode_stacktrace: strip basepath from all paths squashfs: fix length field overlap check in metadata reading mailmap: add entry for Mike Rapoport khugepaged: fix null-pointer dereference due to race mm/hugetlb: avoid hardcoding while checking if cma is enabled mm: memcg/slab: fix memory leak at non-root kmem_cache destroy mm/memcg: fix refcount error while moving and swapping mm/memcontrol: fix OOPS inside mem_cgroup_get_nr_swap_pages() mm: initialize return of vm_insert_pages vfs/xattr: mm/shmem: kernfs: release simple xattr entry in a right way mm/mmap.c: close race between munmap() and expand_upwards()/downwards()
No related branches found
No related tags found
Showing
- .mailmap 3 additions, 0 deletions.mailmap
- MAINTAINERS 11 additions, 0 deletionsMAINTAINERS
- fs/squashfs/block.c 1 addition, 1 deletionfs/squashfs/block.c
- include/linux/io-mapping.h 4 additions, 1 deletioninclude/linux/io-mapping.h
- include/linux/xattr.h 2 additions, 1 deletioninclude/linux/xattr.h
- mm/hugetlb.c 10 additions, 5 deletionsmm/hugetlb.c
- mm/khugepaged.c 3 additions, 0 deletionsmm/khugepaged.c
- mm/memcontrol.c 10 additions, 3 deletionsmm/memcontrol.c
- mm/memory.c 1 addition, 1 deletionmm/memory.c
- mm/mmap.c 14 additions, 2 deletionsmm/mmap.c
- mm/shmem.c 1 addition, 1 deletionmm/shmem.c
- mm/slab_common.c 28 additions, 7 deletionsmm/slab_common.c
- scripts/decode_stacktrace.sh 2 additions, 2 deletionsscripts/decode_stacktrace.sh
- scripts/gdb/linux/symbols.py 1 addition, 1 deletionscripts/gdb/linux/symbols.py
Loading
Please register or sign in to comment