Merge branch 'aarch64/for-next/debug-virtual' into aarch64/for-next/core
authorWill Deacon <will.deacon@arm.com>
Thu, 12 Jan 2017 15:04:29 +0000 (15:04 +0000)
committerWill Deacon <will.deacon@arm.com>
Thu, 12 Jan 2017 15:04:29 +0000 (15:04 +0000)
Merge core DEBUG_VIRTUAL changes from Laura Abbott. Later arm and arm64
support depends on these.

* aarch64/for-next/debug-virtual:
  drivers: firmware: psci: Use __pa_symbol for kernel symbol
  mm/usercopy: Switch to using lm_alias
  mm/kasan: Switch to using __pa_symbol and lm_alias
  kexec: Switch to __pa_symbol
  mm: Introduce lm_alias
  mm/cma: Cleanup highmem check
  lib/Kconfig.debug: Add ARCH_HAS_DEBUG_VIRTUAL


Trivial merge