Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "19 patches. Subsystems affected by this patch series: mm (userfaultfd, migration, memblock, mempolicy, slub, secretmem, and thp), ocfs2, binfmt, vfs, and misc" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mailmap: add Andrej Shadura mm/thp: decrease nr_thps in file's mapping on THP split mm/secretmem: fix NULL page->mapping dereference in page_is_secretmem() vfs: check fd has read access in kernel_read_file_from_fd() elfcore: correct reference to CONFIG_UML mm, slub: fix incorrect memcg slab count for bulk free mm, slub: fix potential use-after-free in slab_debugfs_fops mm, slub: fix potential memoryleak in kmem_cache_open() mm, slub: fix mismatch between reconstructed freelist depth and cnt mm, slub: fix two bugs in slab_debug_trace_open() mm/mempolicy: do not allow illegal MPOL_F_NUMA_BALANCING | MPOL_LOCAL in mbind() memblock: check memory total_size ocfs2: mount fails with buffer overflow in strlen ocfs2: fix data corruption after conversion from inline format mm/migrate: fix CPUHP state to update node demotion order mm/migrate: add CPU hotplug to demotion #ifdef mm/migrate: optimize hotplug-time demotion order updates userfaultfd: fix a race between writeprotect and exit_mmap() mm/userfaultfd: selftests: fix memory corruption with thp enabled
No related branches found
No related tags found
Showing
- .mailmap 2 additions, 0 deletions.mailmap
- fs/kernel_read_file.c 1 addition, 1 deletionfs/kernel_read_file.c
- fs/ocfs2/alloc.c 12 additions, 34 deletionsfs/ocfs2/alloc.c
- fs/ocfs2/super.c 10 additions, 4 deletionsfs/ocfs2/super.c
- fs/userfaultfd.c 9 additions, 3 deletionsfs/userfaultfd.c
- include/linux/cpuhotplug.h 4 additions, 0 deletionsinclude/linux/cpuhotplug.h
- include/linux/elfcore.h 1 addition, 1 deletioninclude/linux/elfcore.h
- include/linux/memory.h 4 additions, 1 deletioninclude/linux/memory.h
- include/linux/secretmem.h 1 addition, 1 deletioninclude/linux/secretmem.h
- mm/huge_memory.c 4 additions, 2 deletionsmm/huge_memory.c
- mm/memblock.c 1 addition, 1 deletionmm/memblock.c
- mm/mempolicy.c 5 additions, 11 deletionsmm/mempolicy.c
- mm/migrate.c 37 additions, 25 deletionsmm/migrate.c
- mm/page_ext.c 1 addition, 3 deletionsmm/page_ext.c
- mm/slab.c 2 additions, 2 deletionsmm/slab.c
- mm/slub.c 24 additions, 7 deletionsmm/slub.c
- tools/testing/selftests/vm/userfaultfd.c 20 additions, 3 deletionstools/testing/selftests/vm/userfaultfd.c
Loading
Please register or sign in to comment