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

diff --cc arch/arm64/Kconfig.platforms
index 7c5a036a9e766b4a25a2d23c24c9fc34b780e608,4a4318bc219ae5043152ec31f65e2c1b9b72b280..2338ce99e1a6dfd1531f72418fba93ca5107ef82
--- 1/arch/arm64/Kconfig.platforms
--- 2/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -159,10 -159,7 +159,9 @@@ config ARCH_TEGR
        select CLKSRC_MMIO
        select CLKSRC_OF
        select GENERIC_CLOCKEVENTS
-       select HAVE_CLK
        select PINCTRL
 +      select PM
 +      select PM_GENERIC_DOMAINS
        select RESET_CONTROLLER
        help
          This enables support for the NVIDIA Tegra SoC family.

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

diff --cc arch/arm64/kvm/sys_regs.c
Simple merge

diff --cc arch/arm64/mm/proc.S
Simple merge

diff --cc drivers/perf/arm_pmu.c
Simple merge

diff --cc include/linux/cpuhotplug.h
Simple merge