| commit | d32e41a1188e929cc0fb16829ce3736046951e39 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 18 May 2018 13:11:51 +0000 (18 14:11 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 18 May 2018 13:11:52 +0000 (18 14:11 +0100) | ||
| tree | 66b60cd46339a23cd8fb5cc36f52db7135b71028 | treesnapshot (tar.gz zip) |
| parent | dba0f15a3b3a2e72a526be665efad73f3c34a5dd | commitdiff |
| parent | cd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5 | commitdiff |
Merge remote-tracking branch 'remotes/famz/tags/docker-and-block-pull-request' into staging
Docker and block patches
Two fairly small fixes.
# gpg: Signature made Fri 18 May 2018 10:17:06 BST
# gpg: using RSA key CA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/docker-and-block-pull-request:
iothread: fix epollfd leak in the process of delIOThread
docker: Fix trivial typo
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Docker and block patches
Two fairly small fixes.
# gpg: Signature made Fri 18 May 2018 10:17:06 BST
# gpg: using RSA key CA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/docker-and-block-pull-request:
iothread: fix epollfd leak in the process of delIOThread
docker: Fix trivial typo
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>