From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 17 May 2018 10:59:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a4207e3b00e89f934adb231057dcf9a75ac2ae45;p=qemu.git

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

# gpg: Signature made Wed 16 May 2018 18:38:15 BST
# gpg:                using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  nfs: Remove processed options from QDict
  nfs: Fix error path in nfs_options_qdict_to_qapi()
  blockjob: do not cancel timer in resume
  qemu-iotests: reduce chance of races in 185

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

a4207e3b00e89f934adb231057dcf9a75ac2ae45