Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "31 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (31 commits) ocfs2: fix potential use after free mm/khugepaged: fix the xas_create_range() error path mm/khugepaged: collapse_shmem() do not crash on Compound mm/khugepaged: collapse_shmem() without freezing new_page mm/khugepaged: minor reorderings in collapse_shmem() mm/khugepaged: collapse_shmem() remember to clear holes mm/khugepaged: fix crashes due to misaccounted holes mm/khugepaged: collapse_shmem() stop if punched or truncated mm/huge_memory: fix lockdep complaint on 32-bit i_size_read() mm/huge_memory: splitting set mapping+index before unfreeze mm/huge_memory: rename freeze_page() to unmap_page() initramfs: clean old path before creating a hardlink kernel/kcov.c: mark funcs in __sanitizer_cov_trace_pc() as notrace psi: make disabling/enabling easier for vendor kernels proc: fixup map_files test on arm debugobjects: avoid recursive calls with kmemleak userfaultfd: shmem: UFFDIO_COPY: set the page dirty if VM_WRITE is not set userfaultfd: shmem: add i_size checks userfaultfd: shmem/hugetlbfs: only allow to register VM_MAYWRITE vmas userfaultfd: shmem: allocate anonymous memory for MAP_PRIVATE shmem ...
Showing
- Documentation/admin-guide/kernel-parameters.txt 4 additions, 0 deletionsDocumentation/admin-guide/kernel-parameters.txt
- MAINTAINERS 7 additions, 6 deletionsMAINTAINERS
- fs/hfs/btree.c 2 additions, 1 deletionfs/hfs/btree.c
- fs/hfsplus/btree.c 2 additions, 1 deletionfs/hfsplus/btree.c
- fs/ocfs2/export.c 1 addition, 1 deletionfs/ocfs2/export.c
- fs/ocfs2/move_extents.c 26 additions, 21 deletionsfs/ocfs2/move_extents.c
- fs/userfaultfd.c 15 additions, 0 deletionsfs/userfaultfd.c
- include/linux/psi.h 2 additions, 1 deletioninclude/linux/psi.h
- init/Kconfig 9 additions, 0 deletionsinit/Kconfig
- init/initramfs.c 12 additions, 10 deletionsinit/initramfs.c
- kernel/kcov.c 2 additions, 2 deletionskernel/kcov.c
- kernel/sched/psi.c 21 additions, 9 deletionskernel/sched/psi.c
- kernel/sched/stats.h 4 additions, 4 deletionskernel/sched/stats.h
- lib/debugobjects.c 2 additions, 3 deletionslib/debugobjects.c
- lib/test_kmod.c 0 additions, 1 deletionlib/test_kmod.c
- mm/gup.c 1 addition, 2 deletionsmm/gup.c
- mm/huge_memory.c 25 additions, 18 deletionsmm/huge_memory.c
- mm/hugetlb.c 1 addition, 1 deletionmm/hugetlb.c
- mm/khugepaged.c 81 additions, 59 deletionsmm/khugepaged.c
- mm/page_alloc.c 3 additions, 1 deletionmm/page_alloc.c
Loading
Please register or sign in to comment