Merge branch 'akpm' (patches from Andrew)
Merge updates from Andrew Morton: - a few hot fixes - ocfs2 updates - almost all of -mm (slab-generic, slab, slub, kmemleak, kasan, cleanups, debug, pagecache, memcg, gup, pagemap, memory-hotplug, sparsemem, vmalloc, initialization, z3fold, compaction, mempolicy, oom-kill, hugetlb, migration, thp, mmap, madvise, shmem, zswap, zsmalloc) * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (132 commits) mm/zsmalloc.c: fix a -Wunused-function warning zswap: do not map same object twice zswap: use movable memory if zpool support allocate movable memory zpool: add malloc_support_movable to zpool_driver shmem: fix obsolete comment in shmem_getpage_gfp() mm/madvise: reduce code duplication in error handling paths mm: mmap: increase sockets maximum memory size pgoff for 32bits mm/mmap.c: refine find_vma_prev() with rb_last() riscv: make mmap allocation top-down by default mips: use generic mmap top-down layout and brk randomization mips: replace arch specific way to determine 32bit task with generic version mips: adjust brk randomization offset to fit generic version mips: use STACK_TOP when computing mmap base address mips: properly account for stack randomization and stack guard gap arm: use generic mmap top-down layout and brk randomization arm: use STACK_TOP when computing mmap base address arm: properly account for stack randomization and stack guard gap arm64, mm: make randomization selected by generic topdown mmap layout arm64, mm: move generic mmap layout functions to mm arm64: consider stack randomization for mmap base only when necessary ...
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/sysfs-kernel-slab 9 additions, 4 deletionsDocumentation/ABI/testing/sysfs-kernel-slab
- Documentation/admin-guide/cgroup-v1/memory.rst 3 additions, 1 deletionDocumentation/admin-guide/cgroup-v1/memory.rst
- Documentation/admin-guide/kernel-parameters.txt 2 additions, 0 deletionsDocumentation/admin-guide/kernel-parameters.txt
- arch/Kconfig 11 additions, 0 deletionsarch/Kconfig
- arch/alpha/include/asm/pgalloc.h 0 additions, 2 deletionsarch/alpha/include/asm/pgalloc.h
- arch/alpha/include/asm/pgtable.h 0 additions, 5 deletionsarch/alpha/include/asm/pgtable.h
- arch/arc/include/asm/pgalloc.h 0 additions, 1 deletionarch/arc/include/asm/pgalloc.h
- arch/arc/include/asm/pgtable.h 0 additions, 5 deletionsarch/arc/include/asm/pgtable.h
- arch/arm/Kconfig 1 addition, 0 deletionsarch/arm/Kconfig
- arch/arm/include/asm/pgalloc.h 0 additions, 2 deletionsarch/arm/include/asm/pgalloc.h
- arch/arm/include/asm/pgtable-nommu.h 0 additions, 5 deletionsarch/arm/include/asm/pgtable-nommu.h
- arch/arm/include/asm/pgtable.h 0 additions, 2 deletionsarch/arm/include/asm/pgtable.h
- arch/arm/include/asm/processor.h 0 additions, 2 deletionsarch/arm/include/asm/processor.h
- arch/arm/kernel/process.c 0 additions, 5 deletionsarch/arm/kernel/process.c
- arch/arm/mm/flush.c 3 additions, 4 deletionsarch/arm/mm/flush.c
- arch/arm/mm/mmap.c 0 additions, 52 deletionsarch/arm/mm/mmap.c
- arch/arm64/Kconfig 1 addition, 1 deletionarch/arm64/Kconfig
- arch/arm64/include/asm/pgalloc.h 0 additions, 2 deletionsarch/arm64/include/asm/pgalloc.h
- arch/arm64/include/asm/pgtable.h 0 additions, 2 deletionsarch/arm64/include/asm/pgtable.h
- arch/arm64/include/asm/processor.h 0 additions, 2 deletionsarch/arm64/include/asm/processor.h
Loading
Please register or sign in to comment