Failed in applying to current master (
apply log)
MAINTAINERS | 12 +++++-----
include/hw/riscv/boot.h | 21 +++++++++--------
include/hw/riscv/boot_opensbi.h | 14 ++++++------
include/hw/riscv/riscv_hart.h | 4 ++--
target/riscv/cpu-qom.h | 40 +++++++++++++++++++++++++++++++++
target/riscv/cpu.h | 24 --------------------
target/riscv/cpu_bits.h | 15 -------------
hw/riscv/boot.c | 28 +++++++++++------------
hw/riscv/opentitan.c | 1 +
hw/riscv/riscv-iommu-pci.c | 5 +++--
hw/riscv/riscv-iommu-sys.c | 1 -
hw/riscv/riscv-iommu.c | 1 +
hw/riscv/virt-acpi-build.c | 1 +
hw/riscv/meson.build | 5 +++--
14 files changed, 88 insertions(+), 84 deletions(-)