From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 18 Aug 2016 13:42:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
X-Git-Tag: qemu-xen-4.8.0-rc1~18
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=02b1ad881cbb1795029737a9077db60267dc0c6f;p=qemu-xen.git

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

# gpg: Signature made Thu 18 Aug 2016 14:39:31 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# 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: fix possible reorder of flush operations
  block: fix deadlock in bdrv_co_flush

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

02b1ad881cbb1795029737a9077db60267dc0c6f