From: Peter Maydell Date: Tue, 28 Feb 2017 08:46:03 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging X-Git-Tag: v2.9.0-rc0~61 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6181478f6395cdd9d6ffd99623d0c9f39ea53606;p=users%2Fdwmw2%2Fqemu.git Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging # gpg: Signature made Mon 27 Feb 2017 16:33:23 GMT # gpg: using RSA key 0x9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: tests-aio-multithread: use atomic_read properly iscsi: do not use aio_context_acquire/release nfs: do not use aio_context_acquire/release curl: do not use aio_context_acquire/release Signed-off-by: Peter Maydell --- 6181478f6395cdd9d6ffd99623d0c9f39ea53606