Merge remote-tracking branch 'arm64/for-next/core'

# Conflicts:
#	arch/arm64/kernel/alternative.c

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/memory.h
Simple merge

diff --cc arch/arm64/kernel/alternative.c
index abc84636af0766f54e808fdee1476ae31bf0af9d,f6fd161850401aec6e8b74b9f8cbe5d85688c3d2..f6aa38436f56a15eb2cd45708d2900d3b553b358
--- 1/arch/arm64/kernel/alternative.c
--- 2/arch/arm64/kernel/alternative.c
+++ b/arch/arm64/kernel/alternative.c
@@@ -133,11 -133,10 +133,10 @@@ static void clean_dcache_range_nopatch(
        } while (cur += d_size, cur < end);
  }
  
- static void __nocfi __apply_alternatives(void *alt_region,  bool is_module,
 -static void __apply_alternatives(struct alt_region *region, bool is_module,
 -                               unsigned long *feature_mask)
++static void __nocfi __apply_alternatives(struct alt_region *region, bool is_module,
 +                                       unsigned long *feature_mask)
  {
        struct alt_instr *alt;
-       struct alt_region *region = alt_region;
        __le32 *origptr, *updptr;
        alternative_cb_t alt_cb;
  

diff --cc arch/arm64/kernel/cpufeature.c
Simple merge

diff --cc arch/arm64/kernel/entry.S
Simple merge

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/kernel/stacktrace.c
Simple merge

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

diff --cc arch/arm64/mm/mmu.c
Simple merge

diff --cc drivers/firmware/psci/psci.c
Simple merge