Merge remote-tracking branch 'remotes/riscv/tags/riscv-qemu-2.12-critical-fixes'...