From: Peter Maydell Date: Thu, 25 Jul 2019 08:59:00 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging X-Git-Tag: v4.1.0~28 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7ea53245335b4f60b56a3323232baa39d9bb1ebb;p=mirror_qemu.git Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging Two more bugfix patches + 1 doc fix. # gpg: Signature made Wed 24 Jul 2019 10:22:06 BST # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini " [full] # gpg: aka "Paolo Bonzini " [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini/tags/for-upstream: docs: correct kconfig option i386/kvm: Do not sync nested state during runtime virtio-scsi: fixed virtio_scsi_ctx_check failed when detaching scsi disk Signed-off-by: Peter Maydell --- 7ea53245335b4f60b56a3323232baa39d9bb1ebb