From: Peter Maydell Date: Tue, 29 Mar 2016 17:25:27 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging X-Git-Tag: v2.6.0-rc0~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b8e6b4cc279e4434ddda94a6b2848834883ec9c;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging slirp updates # gpg: Signature made Tue 29 Mar 2016 00:16:05 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: Rework ipv6 options Use C99 flexible array instead of 1-byte trailing array Avoid embedding struct mbuf in other structures slirp: send icmp6 errors when UDP send failed slirp: Fix memory leak on small incoming ipv4 packet Signed-off-by: Peter Maydell --- 5b8e6b4cc279e4434ddda94a6b2848834883ec9c