diff options
| author | Peter Maydell | 2018-10-08 12:20:17 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-10-08 12:20:17 +0200 |
| commit | bb94c11985a449dbbf47924637276b444857300c (patch) | |
| tree | 062872e726ff3778123630e59c12ed33c1523802 /hw/i2c/exynos4210_i2c.c | |
| parent | Merge remote-tracking branch 'remotes/elmarco/tags/option-pull-request' into ... (diff) | |
| parent | slirp: Propagate host TCP RST packet to the guest after socket disconnected (diff) | |
| download | qemu-bb94c11985a449dbbf47924637276b444857300c.tar.gz qemu-bb94c11985a449dbbf47924637276b444857300c.tar.xz qemu-bb94c11985a449dbbf47924637276b444857300c.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates
Andrew Oates (1):
slirp: fix ICMP handling on macOS hosts
Gavin Grant (1):
slirp: Propagate host TCP RST packet to the guest after socket
disconnected
Peter Maydell (1):
slirp: document mbuf pointers and sizes
# gpg: Signature made Sun 07 Oct 2018 19:04:13 BST
# gpg: using RSA key E3F65A9E9560DB4C
# 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: 33FA 7B64 6195 01F8 CE9C 8F97 E3F6 5A9E 9560 DB4C
* remotes/thibault/tags/samuel-thibault:
slirp: Propagate host TCP RST packet to the guest after socket disconnected
slirp: fix ICMP handling on macOS hosts
slirp: document mbuf pointers and sizes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i2c/exynos4210_i2c.c')
0 files changed, 0 insertions, 0 deletions