Merge branch 'devel-stable' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/setup.c
index 061cea820e3fdbe264ec7ff1d30fe07e33498d09,916a8cf2332861d6d032e9f5b4381b89aca44916..a4729c6be25dc9aff11a519e0f15de0bcce6a913
--- 1/arch/arm/kernel/setup.c
--- 2/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -831,10 -817,10 +831,10 @@@ static void __init reserve_crashkernel(
        if (ret)
                return;
  
-       ret = reserve_bootmem(crash_base, crash_size, BOOTMEM_EXCLUSIVE);
+       ret = memblock_reserve(crash_base, crash_size);
        if (ret < 0) {
 -              printk(KERN_WARNING "crashkernel reservation failed - "
 -                     "memory is in use (0x%lx)\n", (unsigned long)crash_base);
 +              pr_warn("crashkernel reservation failed - memory is in use (0x%lx)\n",
 +                      (unsigned long)crash_base);
                return;
        }
  

diff --cc arch/arm/mm/init.c
Simple merge