]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
projects / qemu-xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73988d5 7376eda)
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 13 Mar 2018 10:49:02 +0000 (10:49 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 13 Mar 2018 10:49:02 +0000 (10:49 +0000)
# gpg: Signature made Mon 12 Mar 2018 16:01:16 GMT
# gpg:                using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  block: make BDRV_POLL_WHILE() re-entrancy safe

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

Trivial merge
qemu-xen (upstream qemu) tree.