summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPeter Maydell2017-08-04 12:07:50 +0200
committerPeter Maydell2017-08-04 12:07:50 +0200
commit413ff8be2fcb5e5c4422f5c1bacdb7e5b5915e5e (patch)
tree46d91274360ae4adcf4dd21ea30fd39e00ce7cf5 /include
parentUpdate version for v2.10.0-rc1 release (diff)
parentslirp: check len against dhcp options array end (diff)
downloadqemu-413ff8be2fcb5e5c4422f5c1bacdb7e5b5915e5e.tar.gz
qemu-413ff8be2fcb5e5c4422f5c1bacdb7e5b5915e5e.tar.xz
qemu-413ff8be2fcb5e5c4422f5c1bacdb7e5b5915e5e.zip
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates # gpg: Signature made Wed 02 Aug 2017 23:27:41 BST # gpg: using RSA key 0x9E511E01C737F075 # gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" # gpg: aka "Samuel Thibault <sthibault@debian.org>" # gpg: aka "Samuel Thibault <samuel.thibault@gnu.org>" # gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" # gpg: aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" # 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: 9A37 3D36 64A8 DC62 DA0A 34FD 9E51 1E01 C737 F075 * remotes/thibault/tags/samuel-thibault: slirp: check len against dhcp options array end slirp: fill error when failing to initialize user network Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions