From: Peter Maydell Date: Tue, 15 Jan 2019 17:24:00 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4b9f0b0f7c84eea2dfb0d5be3e0254bc91319dbc;p=people%2Fpauldu%2Fqemu.git Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging Pull request No user-visible changes. # gpg: Signature made Mon 14 Jan 2019 16:32:19 GMT # gpg: using RSA key 9CA4ABB381AB73C8 # 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: aio-posix: Fix concurrent aio_poll/set_fd_handler. aio-posix: Unregister fd from ctx epoll when removing fd_handler. Signed-off-by: Peter Maydell --- 4b9f0b0f7c84eea2dfb0d5be3e0254bc91319dbc