diff options
| author | Peter Maydell | 2017-03-30 16:28:19 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-03-30 16:28:19 +0200 |
| commit | e839001d5bb6c84932e2d82bd383477b2023f407 (patch) | |
| tree | 303e20b390bc81888136e3b0631e672220d3dbc3 /hw/net/virtio-net.c | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.9-20170329' into... (diff) | |
| parent | slirp: Send RDNSS in RA only if host has an IPv6 DNS server (diff) | |
| download | qemu-e839001d5bb6c84932e2d82bd383477b2023f407.tar.gz qemu-e839001d5bb6c84932e2d82bd383477b2023f407.tar.xz qemu-e839001d5bb6c84932e2d82bd383477b2023f407.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates
# gpg: Signature made Tue 28 Mar 2017 23:51:51 BST
# gpg: using RSA key 0xB0A51BF58C9179C5
# 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: AEBF 7448 FAB9 453A 4552 390E B0A5 1BF5 8C91 79C5
* remotes/thibault/tags/samuel-thibault:
slirp: Send RDNSS in RA only if host has an IPv6 DNS server
slirp: Make RA build more flexible
slirp: fix compilation errors with DEBUG set
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions