From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 26 May 2025 20:27:00 +0000 (-0400)
Subject: Merge tag 'kvm-riscv-6.16-1' of https://github.com/kvm-riscv/linux into HEAD
X-Git-Tag: v6.16-rc1~129^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f7c9d52b12ded6c99b5623d1e81bba7bb76c2f4;p=thirdparty%2Flinux.git

Merge tag 'kvm-riscv-6.16-1' of https://github.com/kvm-riscv/linux into HEAD

KVM/riscv changes for 6.16

- Add vector registers to get-reg-list selftest
- VCPU reset related improvements
- Remove scounteren initialization from VCPU reset
- Support VCPU reset from userspace using set_mpstate() ioctl
---

1f7c9d52b12ded6c99b5623d1e81bba7bb76c2f4
diff --cc include/uapi/linux/kvm.h
index e6ed559d90910,454b7d4a04481..d00b85cb168c3
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -931,8 -930,7 +931,9 @@@ struct kvm_enable_cap 
  #define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237
  #define KVM_CAP_X86_GUEST_MODE 238
  #define KVM_CAP_ARM_WRITABLE_IMP_ID_REGS 239
 -#define KVM_CAP_RISCV_MP_STATE_RESET 240
 +#define KVM_CAP_ARM_EL2 240
 +#define KVM_CAP_ARM_EL2_E2H0 241
++#define KVM_CAP_RISCV_MP_STATE_RESET 242
  
  struct kvm_irq_routing_irqchip {
  	__u32 irqchip;