From: Peter Maydell Date: Thu, 7 Apr 2016 11:15:33 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging X-Git-Tag: v2.6.0-rc2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e380023898479b57d38c0569c02f7bd41090181b;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging slirp updates # gpg: Signature made Thu 07 Apr 2016 12:02:23 BST using RSA key ID FB6B2F1D # gpg: Good signature from "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # 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: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6 # Subkey fingerprint: F632 74CD C630 0873 CB3D 29D9 E3E5 1CE8 FB6B 2F1D * remotes/thibault/tags/samuel-thibault: slirp: handle deferred ECONNREFUSED on non-blocking TCP sockets slirp: Propagate host TCP RST to the guest. slirp: avoid use-after-free in slirp_pollfds_poll() if soread() returns an error slirp: don't crash when tcp_sockclosed() is called with a NULL tp Signed-off-by: Peter Maydell --- e380023898479b57d38c0569c02f7bd41090181b