]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Sep 2021 17:08:28 +0000 (10:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Sep 2021 17:08:28 +0000 (10:08 -0700)
Merge misc updates from Andrew Morton:
 "173 patches.

  Subsystems affected by this series: ia64, ocfs2, block, and mm (debug,
  pagecache, gup, swap, shmem, memcg, selftests, pagemap, mremap,
  bootmem, sparsemem, vmalloc, kasan, pagealloc, memory-failure,
  hugetlb, userfaultfd, vmscan, compaction, mempolicy, memblock,
  oom-kill, migration, ksm, percpu, vmstat, and madvise)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (173 commits)
  mm/madvise: add MADV_WILLNEED to process_madvise()
  mm/vmstat: remove unneeded return value
  mm/vmstat: simplify the array size calculation
  mm/vmstat: correct some wrong comments
  mm/percpu,c: remove obsolete comments of pcpu_chunk_populated()
  selftests: vm: add COW time test for KSM pages
  selftests: vm: add KSM merging time test
  mm: KSM: fix data type
  selftests: vm: add KSM merging across nodes test
  selftests: vm: add KSM zero page merging test
  selftests: vm: add KSM unmerge test
  selftests: vm: add KSM merge test
  mm/migrate: correct kernel-doc notation
  mm: wire up syscall process_mrelease
  mm: introduce process_mrelease system call
  memblock: make memblock_find_in_range method private
  mm/mempolicy.c: use in_task() in mempolicy_slab_node()
  mm/mempolicy: unify the create() func for bind/interleave/prefer-many policies
  mm/mempolicy: advertise new MPOL_PREFERRED_MANY
  mm/hugetlb: add support for mempolicy MPOL_PREFERRED_MANY
  ...

51 files changed:
1  2 
arch/alpha/kernel/syscalls/syscall.tbl
arch/arm/tools/syscall.tbl
arch/arm64/include/asm/unistd32.h
arch/arm64/mm/init.c
arch/ia64/kernel/syscalls/syscall.tbl
arch/m68k/kernel/syscalls/syscall.tbl
arch/microblaze/kernel/syscalls/syscall.tbl
arch/mips/kernel/syscalls/syscall_o32.tbl
arch/parisc/kernel/syscalls/syscall.tbl
arch/powerpc/kernel/syscalls/syscall.tbl
arch/riscv/mm/init.c
arch/s390/kernel/setup.c
arch/s390/kernel/syscalls/syscall.tbl
arch/s390/mm/fault.c
arch/sh/kernel/syscalls/syscall.tbl
arch/sparc/kernel/syscalls/syscall.tbl
arch/x86/entry/syscalls/syscall_32.tbl
arch/xtensa/kernel/syscalls/syscall.tbl
block/blk-map.c
drivers/mmc/host/mmc_spi.c
fs/exec.c
fs/fcntl.c
fs/fs-writeback.c
fs/inode.c
fs/locks.c
fs/namei.c
fs/namespace.c
include/linux/backing-dev.h
include/linux/memcontrol.h
include/linux/mm.h
include/linux/syscalls.h
include/linux/writeback.h
kernel/signal.c
kernel/sys_ni.c
kernel/sysctl.c
kernel/time/posix-timers.c
lib/scatterlist.c
lib/test_kasan.c
mm/backing-dev.c
mm/filemap.c
mm/kasan/hw_tags.c
mm/kasan/kasan.h
mm/madvise.c
mm/memblock.c
mm/memcontrol.c
mm/memory-failure.c
mm/mmap.c
mm/page-writeback.c
mm/shmem.c
mm/truncate.c
mm/vmstat.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index fe14beb338e5cdef26299862d38b46a98c3ca8a8,0bab57d6413b282d8124d5201f2a12288a287313..5a01872f598481f6b6ef41971400ad51cc8e65b0
@@@ -687,10 -637,12 +688,12 @@@ static void __init reserve_crashkernel(
                return;
        }
  
-       if (register_memory_notifier(&kdump_mem_nb))
+       if (register_memory_notifier(&kdump_mem_nb)) {
+               memblock_free(crash_base, crash_size);
                return;
+       }
  
 -      if (!OLDMEM_BASE && MACHINE_IS_VM)
 +      if (!oldmem_data.start && MACHINE_IS_VM)
                diag10_range(PFN_DOWN(crash_base), PFN_DOWN(crash_size));
        crashk_res.start = crash_base;
        crashk_res.end = crash_base + crash_size - 1;
Simple merge
Simple merge
Simple merge
diff --cc block/blk-map.c
Simple merge
Simple merge
diff --cc fs/exec.c
Simple merge
diff --cc fs/fcntl.c
Simple merge
Simple merge
diff --cc fs/inode.c
Simple merge
diff --cc fs/locks.c
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc fs/namespace.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/signal.c
Simple merge
diff --cc kernel/sys_ni.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/filemap.c
Simple merge
Simple merge
Simple merge
diff --cc mm/madvise.c
Simple merge
diff --cc mm/memblock.c
Simple merge
diff --cc mm/memcontrol.c
Simple merge
Simple merge
diff --cc mm/mmap.c
Simple merge
Simple merge
diff --cc mm/shmem.c
Simple merge
diff --cc mm/truncate.c
Simple merge
diff --cc mm/vmstat.c
Simple merge