OSDN Git Service

Merge branch 'for-next/kvm/errata' into for-next/core
authorWill Deacon <will@kernel.org>
Thu, 28 May 2020 17:02:51 +0000 (18:02 +0100)
committerWill Deacon <will@kernel.org>
Thu, 28 May 2020 17:02:51 +0000 (18:02 +0100)
commitc350717ec7de67daad26d996efe7f3d97d95aa9c
treed52adde14dec02a415ef4a255027997c160452bc
parentd27865279f12035c730818aa1a0280fada866a37
parentfe677be989146b8a8c0f26fe626c6567c4cd3837
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}
arch/arm64/Kconfig
arch/arm64/include/asm/cpucaps.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/include/asm/kvm_mmu.h
arch/arm64/kernel/cpu_errata.c