From: Peter Maydell Date: Tue, 28 Jul 2015 12:22:57 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/cody/tags/jtc-for-upstream-pull-request' into... X-Git-Tag: qemu-xen-4.7.0-rc1~136 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9f8c5b69c2b9ca8b9c3e569b0f41bd60a0b9e9fe;p=qemu-xen.git Merge remote-tracking branch 'remotes/cody/tags/jtc-for-upstream-pull-request' into staging # gpg: Signature made Tue Jul 28 05:22:29 2015 BST using RSA key ID C0DE3057 # gpg: Good signature from "Jeffrey Cody " # gpg: aka "Jeffrey Cody " # gpg: aka "Jeffrey Cody " # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057 * remotes/cody/tags/jtc-for-upstream-pull-request: block/ssh: Avoid segfault if inet_connect doesn't set errno. sheepdog: serialize requests to overwrapping area Signed-off-by: Peter Maydell --- 9f8c5b69c2b9ca8b9c3e569b0f41bd60a0b9e9fe