The following changes since commit a4207e3b00e89f934adb231057dcf9a75ac2ae45:
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-05-17 11:59:50 +0100) are available in the Git repository at: git://github.com/famz/qemu.git tags/docker-and-block-pull-request for you to fetch changes up to cd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5: iothread: fix epollfd leak in the process of delIOThread (2018-05-18 17:09:54 +0800) ---------------------------------------------------------------- Docker and block patches Two fairly small fixes. ---------------------------------------------------------------- Jie Wang (1): iothread: fix epollfd leak in the process of delIOThread Philippe Mathieu-Daudé (1): docker: Fix trivial typo include/block/aio.h | 8 ++++++++ tests/docker/Makefile.include | 2 +- util/aio-posix.c | 13 ++++++++++--- util/aio-win32.c | 4 ++++ util/async.c | 1 + 5 files changed, 24 insertions(+), 4 deletions(-) -- 2.14.3