From: Peter Maydell Date: Thu, 18 Aug 2016 09:27:57 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4b887ae65880bf7eae53ba8af40599581fe759e5;p=qemu.git Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging Fix 'make docker-test-mingw@fedora' Peter, This is the single patch that stalls patchew's mingw testing. Since it is small and trivial, let's have it in 2.7. Fam # gpg: Signature made Wed 17 Aug 2016 13:13:53 BST # gpg: using RSA key 0xCA35624C6A9171C6 # gpg: Good signature from "Fam Zheng " # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6 * remotes/famz/tags/docker-pull-request: curl: Cast fd to int for DPRINTF Signed-off-by: Peter Maydell --- 4b887ae65880bf7eae53ba8af40599581fe759e5