| commit | 42d1a731ffee44b16c06df371ffdbb14135c11e3 | [log] [tgz] |
|---|---|---|
| author | Will Deacon <will.deacon@arm.com> | Thu Jan 12 15:04:29 2017 +0000 |
| committer | Will Deacon <will.deacon@arm.com> | Thu Jan 12 15:04:29 2017 +0000 |
| tree | 8d78d86e34dfd7ec44377df098371f322c463152 | |
| parent | 4aa8a472c33f4024381ade56bef008a9c566366a [diff] | |
| parent | 1a08e3d9e0ac4577ba89dbdb38f593fe050f88fc [diff] |
Merge branch 'aarch64/for-next/debug-virtual' into aarch64/for-next/core 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