Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton: "15 patches. Subsystems affected by this patch series: mailmap, mm/hotfixes, mm/thp, mm/memory-hotplug, misc, kcsan" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: kcsan: kconfig: move to menu 'Generic Kernel Debugging Instruments' fs/fs-writeback.c: adjust dirtytime_interval_handler definition to match prototype stackleak: let stack_erasing_sysctl take a kernel pointer buffer ftrace: let ftrace_enable_sysctl take a kernel pointer buffer mm/memory_hotplug: drain per-cpu pages again during memory offline selftests/vm: fix display of page size in map_hugetlb mm/thp: fix __split_huge_pmd_locked() for migration PMD kprobes: fix kill kprobe which has been marked as gone tmpfs: restore functionality of nr_inodes=0 mlock: fix unevictable_pgs event counts on THP mm: fix check_move_unevictable_pages() on THP mm: migration of hugetlbfs page skip memcg ksm: reinstate memcg charge on copied pages mailmap: add older email addresses for Kees Cook
Showing
- .mailmap 4 additions, 0 deletions.mailmap
- fs/fs-writeback.c 1 addition, 1 deletionfs/fs-writeback.c
- include/linux/ftrace.h 1 addition, 2 deletionsinclude/linux/ftrace.h
- include/linux/stackleak.h 1 addition, 1 deletioninclude/linux/stackleak.h
- kernel/kprobes.c 8 additions, 1 deletionkernel/kprobes.c
- kernel/stackleak.c 1 addition, 1 deletionkernel/stackleak.c
- kernel/trace/ftrace.c 1 addition, 2 deletionskernel/trace/ftrace.c
- lib/Kconfig.debug 1 addition, 3 deletionslib/Kconfig.debug
- mm/huge_memory.c 23 additions, 19 deletionsmm/huge_memory.c
- mm/ksm.c 4 additions, 0 deletionsmm/ksm.c
- mm/memory_hotplug.c 14 additions, 0 deletionsmm/memory_hotplug.c
- mm/migrate.c 2 additions, 1 deletionmm/migrate.c
- mm/mlock.c 15 additions, 9 deletionsmm/mlock.c
- mm/page_isolation.c 8 additions, 0 deletionsmm/page_isolation.c
- mm/shmem.c 6 additions, 4 deletionsmm/shmem.c
- mm/swap.c 3 additions, 3 deletionsmm/swap.c
- mm/vmscan.c 8 additions, 2 deletionsmm/vmscan.c
- tools/testing/selftests/vm/map_hugetlb.c 1 addition, 1 deletiontools/testing/selftests/vm/map_hugetlb.c
Loading
Please register or sign in to comment