Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
commit229c0372cf3ca201c41d2bb121627e6752e776ad
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 24 Nov 2015 10:27:19 +0000 (24 10:27 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 24 Nov 2015 10:27:19 +0000 (24 10:27 +0000)
tree3e174681776a6d36a270ddfc6fa004b055971c9c
parent5522a841cab5f15ac0f8d207b320c21755a7a1a5
parent466138dc689b6b14f31d5d20316affb4b4efd177
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>