Merge branch 'akpm' (patches from Andrew)
Merge updates from Andrew Morton: "Incoming: - a small number of updates to scripts/, ocfs2 and fs/buffer.c - most of MM I still have quite a lot of material (mostly not MM) staged after linux-next due to -next dependencies. I'll send those across next week as the preprequisites get merged up" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (135 commits) mm/page_io.c: annotate refault stalls from swap_readpage mm/Kconfig: fix trivial help text punctuation mm/Kconfig: fix indentation mm/memory_hotplug.c: remove __online_page_set_limits() mm: fix typos in comments when calling __SetPageUptodate() mm: fix struct member name in function comments mm/shmem.c: cast the type of unmap_start to u64 mm: shmem: use proper gfp flags for shmem_writepage() mm/shmem.c: make array 'values' static const, makes object smaller userfaultfd: require CAP_SYS_PTRACE for UFFD_FEATURE_EVENT_FORK fs/userfaultfd.c: wp: clear VM_UFFD_MISSING or VM_UFFD_WP during userfaultfd_register() userfaultfd: wrap the common dst_vma check into an inlined function userfaultfd: remove unnecessary WARN_ON() in __mcopy_atomic_hugetlb() userfaultfd: use vma_pagesize for all huge page size calculation mm/madvise.c: use PAGE_ALIGN[ED] for range checking mm/madvise.c: replace with page_size() in madvise_inject_error() mm/mmap.c: make vma_merge() comment more easy to understand mm/hwpoison-inject: use DEFINE_DEBUGFS_ATTRIBUTE to define debugfs fops autonuma: reduce cache footprint when scanning page tables autonuma: fix watermark checking in migrate_balanced_pgdat() ...
Showing
- Documentation/admin-guide/cgroup-v2.rst 6 additions, 1 deletionDocumentation/admin-guide/cgroup-v2.rst
- Documentation/dev-tools/kasan.rst 63 additions, 0 deletionsDocumentation/dev-tools/kasan.rst
- arch/Kconfig 5 additions, 4 deletionsarch/Kconfig
- arch/arc/include/asm/pgtable.h 0 additions, 1 deletionarch/arc/include/asm/pgtable.h
- arch/arc/mm/fault.c 8 additions, 2 deletionsarch/arc/mm/fault.c
- arch/arc/mm/highmem.c 3 additions, 1 deletionarch/arc/mm/highmem.c
- arch/powerpc/include/asm/book3s/64/pgtable-4k.h 0 additions, 3 deletionsarch/powerpc/include/asm/book3s/64/pgtable-4k.h
- arch/powerpc/include/asm/book3s/64/pgtable-64k.h 0 additions, 3 deletionsarch/powerpc/include/asm/book3s/64/pgtable-64k.h
- arch/powerpc/mm/book3s64/radix_pgtable.c 1 addition, 0 deletionsarch/powerpc/mm/book3s64/radix_pgtable.c
- arch/x86/Kconfig 1 addition, 0 deletionsarch/x86/Kconfig
- arch/x86/mm/kasan_init_64.c 61 additions, 0 deletionsarch/x86/mm/kasan_init_64.c
- drivers/base/memory.c 15 additions, 25 deletionsdrivers/base/memory.c
- drivers/hv/hv_balloon.c 1 addition, 3 deletionsdrivers/hv/hv_balloon.c
- drivers/xen/balloon.c 0 additions, 1 deletiondrivers/xen/balloon.c
- fs/buffer.c 4 additions, 2 deletionsfs/buffer.c
- fs/direct-io.c 0 additions, 21 deletionsfs/direct-io.c
- fs/hugetlbfs/inode.c 48 additions, 15 deletionsfs/hugetlbfs/inode.c
- fs/ocfs2/acl.c 2 additions, 2 deletionsfs/ocfs2/acl.c
- fs/userfaultfd.c 13 additions, 8 deletionsfs/userfaultfd.c
- include/asm-generic/4level-fixup.h 0 additions, 1 deletioninclude/asm-generic/4level-fixup.h
Please register or sign in to comment