Merge tag 'v5.12-rc3' into kvm-arm64/host-stage2

Linux 5.12-rc3

Signed-off-by: Marc Zyngier <maz@kernel.org>
# gpg: Signature made Sun 14 Mar 2021 21:41:02 GMT
# gpg:                using RSA key ABAF11C65A2970B130ABE3C479BE3E4300411886
# gpg:                issuer "torvalds@linux-foundation.org"
# gpg: Can't check signature: No public key

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/kvm_hyp.h
index a3e89424ae63b7a0cee933cf000e0582017ca4e9,32ae676236b6b4dc85d101be97976fecc3f2fcf8..8b6c3a7aac519ee83e73a9399acc8048c7ac9cc6
--- 1/arch/arm64/include/asm/kvm_hyp.h
--- 2/arch/arm64/include/asm/kvm_hyp.h
+++ b/arch/arm64/include/asm/kvm_hyp.h
@@@ -83,10 -83,13 +83,15 @@@ void sysreg_restore_guest_state_vhe(str
  void __debug_switch_to_guest(struct kvm_vcpu *vcpu);
  void __debug_switch_to_host(struct kvm_vcpu *vcpu);
  
+ #ifdef __KVM_NVHE_HYPERVISOR__
+ void __debug_save_host_buffers_nvhe(struct kvm_vcpu *vcpu);
+ void __debug_restore_host_buffers_nvhe(struct kvm_vcpu *vcpu);
+ #endif
+ 
  void __fpsimd_save_state(struct user_fpsimd_state *fp_regs);
  void __fpsimd_restore_state(struct user_fpsimd_state *fp_regs);
 +void __sve_save_state(void *sve_pffr, u32 *fpsr);
 +void __sve_restore_state(void *sve_pffr, u32 *fpsr);
  
  #ifndef __KVM_NVHE_HYPERVISOR__
  void activate_traps_vhe_load(struct kvm_vcpu *vcpu);

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

diff --cc arch/arm64/kvm/hyp/include/hyp/switch.h
Simple merge

diff --cc arch/arm64/kvm/hyp/nvhe/hyp-main.c
Simple merge

diff --cc arch/arm64/kvm/hyp/nvhe/switch.c
Simple merge

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