| commit | 53343338a6e7b83777b82803398572b40afc8c0f | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 22 Apr 2016 15:17:12 +0000 (22 16:17 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 22 Apr 2016 15:17:12 +0000 (22 16:17 +0100) | ||
| tree | a6b16ffcb414941d0cd6c63d0c7c3050a3a73451 | treesnapshot (tar.gz zip) |
| parent | ee1e0f8e5d3682c561edcdceccff72b9d9b16d8b | commitdiff |
| parent | ab27c3b5e7408693dde0b565f050aa55c4a1bcef | commitdiff |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Mirror block job fixes for 2.6.0-rc4
# gpg: Signature made Fri 22 Apr 2016 15:46:41 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
mirror: Workaround for unexpected iohandler events during completion
aio-posix: Skip external nodes in aio_dispatch
virtio: Mark host notifiers as external
event-notifier: Add "is_external" parameter
iohandler: Introduce iohandler_get_aio_context
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Mirror block job fixes for 2.6.0-rc4
# gpg: Signature made Fri 22 Apr 2016 15:46:41 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
mirror: Workaround for unexpected iohandler events during completion
aio-posix: Skip external nodes in aio_dispatch
virtio: Mark host notifiers as external
event-notifier: Add "is_external" parameter
iohandler: Introduce iohandler_get_aio_context
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>