Merge branch 'kvm-arm64/misc-5.13' into kvmarm-master/next

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

diff --cc Documentation/virt/kvm/api.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/kvm/arm.c
index 3f98dbe,8526101..74acc44
--- 1/arch/arm64/kvm/arm.c
--- 2/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@@ -1881,18 -1808,12 +1881,20 @@@ static int init_hyp_mode(void
        if (is_protected_kvm_enabled()) {
                init_cpu_logical_map();
  
-               if (!init_psci_relay())
+               if (!init_psci_relay()) {
+                       err = -ENODEV;
                        goto out_err;
+               }
        }
  
 +      if (is_protected_kvm_enabled()) {
 +              err = kvm_hyp_init_protection(hyp_va_bits);
 +              if (err) {
 +                      kvm_err("Failed to init hyp memory protection\n");
 +                      goto out_err;
 +              }
 +      }
 +
        return 0;
  
  out_err:

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