From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 3 Dec 2018 17:12:48 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3af8c4be90e1e125e4269181c5de4f2f3fc16cb1;p=qemu.git

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- mirror: Fix deadlock

# gpg: Signature made Mon 03 Dec 2018 16:57:33 GMT
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  iotests: simple mirror test with kvm on 1G image
  mirror: fix dead-lock

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

3af8c4be90e1e125e4269181c5de4f2f3fc16cb1