From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Sep 2021 17:08:28 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: microblaze-v5.16~108
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=14726903c835101cd8d0a703b609305094350d61

Merge branch 'akpm' (patches from Andrew)

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
  ...
---

14726903c835101cd8d0a703b609305094350d61
diff --cc arch/s390/kernel/setup.c
index fe14beb338e5,0bab57d6413b..5a01872f5984
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@@ -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;