| commit | c350717ec7de67daad26d996efe7f3d97d95aa9c | [log] [tgz] |
|---|---|---|
| author | Will Deacon <will@kernel.org> | Thu May 28 18:02:51 2020 +0100 |
| committer | Will Deacon <will@kernel.org> | Thu May 28 18:02:51 2020 +0100 |
| tree | d52adde14dec02a415ef4a255027997c160452bc | |
| parent | d27865279f12035c730818aa1a0280fada866a37 [diff] | |
| parent | fe677be989146b8a8c0f26fe626c6567c4cd3837 [diff] |
Merge branch 'for-next/kvm/errata' into for-next/core
KVM CPU errata rework
(Andrew Scull and Marc Zyngier)
* for-next/kvm/errata:
KVM: arm64: Move __load_guest_stage2 to kvm_mmu.h
arm64: Unify WORKAROUND_SPECULATIVE_AT_{NVHE,VHE}