Merge remote-tracking branch 'origin/kvm-arm64/csv3' into kvmarm-master/queue

Signed-off-by: Marc Zyngier <maz@kernel.org>

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

diff --cc arch/arm64/include/asm/spectre.h
index 4e6d90a4fbe07ef81a4454f977b89b7fc12939bc,52e788981f4a268d8b087e6825203b76d922f262..f62ca39da6c5a70fef556c1b62fc72e0a10b0739
--- 1/arch/arm64/include/asm/spectre.h
--- 2/arch/arm64/include/asm/spectre.h
+++ b/arch/arm64/include/asm/spectre.h
@@@ -91,5 -29,6 +91,7 @@@ bool has_spectre_v4(const struct arm64_
  void spectre_v4_enable_mitigation(const struct arm64_cpu_capabilities *__unused);
  void spectre_v4_enable_task_mitigation(struct task_struct *tsk);
  
+ enum mitigation_state arm64_get_meltdown_state(void);
+ 
 +#endif        /* __ASSEMBLY__ */
  #endif        /* __ASM_SPECTRE_H */

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

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