The following changes since commit c416eecea5f3aea863ab8fda5a36a24157b8f704:
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2018-05-15 17:02:00 +0100) are available in the git repository at: git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request for you to fetch changes up to c82be42cc803b36fd7aed5dceec68312c7056fd5: nfs: Remove processed options from QDict (2018-05-16 13:37:47 -0400) ---------------------------------------------------------------- Block patches ---------------------------------------------------------------- Kevin Wolf (2): nfs: Fix error path in nfs_options_qdict_to_qapi() nfs: Remove processed options from QDict Stefan Hajnoczi (2): qemu-iotests: reduce chance of races in 185 blockjob: do not cancel timer in resume block/nfs.c | 8 ++++++++ blockjob.c | 22 +++++++++++++++------- tests/qemu-iotests/185 | 17 +++++++++++++---- tests/qemu-iotests/185.out | 12 +++++------- 4 files changed, 41 insertions(+), 18 deletions(-) -- 2.13.6
