From: Paolo Bonzini <pbonzini@redhat.com>
Date: Sat, 22 Oct 2022 07:33:58 +0000 (-0400)
Subject: Merge tag 'kvm-riscv-fixes-6.1-1' of https://github.com/kvm-riscv/linux into HEAD
X-Git-Tag: v6.1-rc2~1^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=21e6075974c82808fc46ffc72384f2cc8074777f;p=users%2Fdwmw2%2Flinux.git

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

KVM/riscv fixes for 6.1, take #1

- Fix compilation without RISCV_ISA_ZICBOM
- Fix kvm_riscv_vcpu_timer_pending() for Sstc
---

21e6075974c82808fc46ffc72384f2cc8074777f