From: Peter Maydell Date: Tue, 4 Aug 2020 15:51:32 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Tag: v5.1.0-rc3~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=881419b7117d5350c2a0288bfb79f2a83715df32;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging virtio: bugfix A last minute bugfix. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Tue 04 Aug 2020 16:48:37 BST # gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469 # gpg: issuer "mst@redhat.com" # gpg: Good signature from "Michael S. Tsirkin " [full] # gpg: aka "Michael S. Tsirkin " [full] # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * remotes/mst/tags/for_upstream: virtio-mem: Correct format specifier mismatch for RISC-V Signed-off-by: Peter Maydell --- 881419b7117d5350c2a0288bfb79f2a83715df32