| commit | 02b1ad881cbb1795029737a9077db60267dc0c6f | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 18 Aug 2016 13:42:51 +0000 (18 14:42 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 18 Aug 2016 13:42:51 +0000 (18 14:42 +0100) | ||
| tree | cb957f9d06a1dcd3591dc4a19b03edfe0018ff97 | treesnapshot (tar.gz zip) |
| parent | 5844365fe8e5e4598222d276d2af54fd45c7e3d3 | commitdiff |
| parent | 156af3ac98da24f0155eed18ec546157436d6b2e | commitdiff |
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>
# 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>