Commit 29b5bbf7 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

KVM/riscv fixes for 6.11, take #1

- Fix compile error in get-reg-list selftests
parents 8400291e dd4a799b

tools/testing/selftests/kvm/riscv/get-reg-list.c

+4 −4
Original line number Diff line number Diff line
@@ -961,10 +961,10 @@ KVM_ISA_EXT_SIMPLE_CONFIG(zbkb, ZBKB); 
KVM_ISA_EXT_SIMPLE_CONFIG(zbkc, ZBKC);

KVM_ISA_EXT_SIMPLE_CONFIG(zbkx, ZBKX);

KVM_ISA_EXT_SIMPLE_CONFIG(zbs, ZBS);

KVM_ISA_EXT_SIMPLE_CONFIG(zca, ZCA),

KVM_ISA_EXT_SIMPLE_CONFIG(zcb, ZCB),

KVM_ISA_EXT_SIMPLE_CONFIG(zcd, ZCD),

KVM_ISA_EXT_SIMPLE_CONFIG(zcf, ZCF),

KVM_ISA_EXT_SIMPLE_CONFIG(zca, ZCA);

KVM_ISA_EXT_SIMPLE_CONFIG(zcb, ZCB);

KVM_ISA_EXT_SIMPLE_CONFIG(zcd, ZCD);

KVM_ISA_EXT_SIMPLE_CONFIG(zcf, ZCF);

KVM_ISA_EXT_SIMPLE_CONFIG(zcmop, ZCMOP);

KVM_ISA_EXT_SIMPLE_CONFIG(zfa, ZFA);

KVM_ISA_EXT_SIMPLE_CONFIG(zfh, ZFH);