From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 24 Nov 2015 10:27:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
X-Git-Tag: v2.5.0-rc2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=229c0372cf3ca201c41d2bb121627e6752e776ad;p=thirdparty%2Fqemu.git

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

# gpg: Signature made Tue 24 Nov 2015 08:04:07 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  virtio-blk: Move resetting of req->mr_next to virtio_blk_handle_rw_error
  parallels: dirty BAT properly for continuous allocations

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

229c0372cf3ca201c41d2bb121627e6752e776ad