Merge branch kvm-arm64/misc-6.14 into kvmarm-master/next

* kvm-arm64/misc-6.14:
  : .
  : Misc KVM/arm64 changes for 6.14
  :
  : - Don't expose AArch32 EL0 capability when NV is enabled
  :
  : - Update documentation to reflect the full gamut of kvm-arm.mode
  :   behaviours
  :
  : - Use the hypervisor VA bit width when dumping stacktraces
  :
  : - Decouple the hypervisor stack size from PAGE_SIZE, at least
  :   on the surface...
  :
  : - Make use of str_enabled_disabled() when advertising GICv4.1 support
  :
  : - Explicitly handle BRBE traps as UNDEFINED
  : .
  KVM: arm64: Explicitly handle BRBE traps as UNDEFINED
  KVM: arm64: vgic: Use str_enabled_disabled() in vgic_v3_probe()
  arm64: kvm: Introduce nvhe stack size constants
  KVM: arm64: Fix nVHE stacktrace VA bits mask
  Documentation: Update the behaviour of "kvm-arm.mode"
  KVM: arm64: nv: Advertise the lack of AArch32 EL0 support

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

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

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

diff --cc arch/arm64/kvm/mmu.c
index 9403524c11c614e1c8ac39ee61dc445411ae988b,8850741243bb5a742010119ac7e1a9687bbb8901..1f55b0c7b11d942836917cda4c1c6c9d73804dd0
--- 1/arch/arm64/kvm/mmu.c
--- 2/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@@ -30,10 -29,10 +30,12 @@@ static unsigned long __ro_after_init hy
  static unsigned long __ro_after_init hyp_idmap_end;
  static phys_addr_t __ro_after_init hyp_idmap_vector;
  
+ u32 __ro_after_init __hyp_va_bits;
+ 
  static unsigned long __ro_after_init io_map_base;
  
 +#define KVM_PGT_FN(fn)                (!is_protected_kvm_enabled() ? fn : p ## fn)
 +
  static phys_addr_t __stage2_range_addr_end(phys_addr_t addr, phys_addr_t end,
                                           phys_addr_t size)
  {

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

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

diff --cc arch/arm64/kvm/vgic/vgic-v3.c
Simple merge