diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-23 16:05:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-23 16:05:00 +0100 |
| commit | 9b29b44e8ee55456e7df8106530534e1e6ef0d64 (patch) | |
| tree | 4c143d20ae0f075db01fb608c0e424418e495f68 /qom | |
| parent | 7acd80e82d9332dfdaedc60c91eb3ec5195738bb (diff) | |
| parent | 0fca92b9077af9817c04545cdfc519fe95c6fde9 (diff) | |
| download | qemu-9b29b44e8ee55456e7df8106530534e1e6ef0d64.zip qemu-9b29b44e8ee55456e7df8106530534e1e6ef0d64.tar.gz qemu-9b29b44e8ee55456e7df8106530534e1e6ef0d64.tar.bz2 | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
Fam Zheng (2):
slirp: Add sanity check for str option length
slirp: Implement RFC2132 TFTP server name
# gpg: Signature made Sun 21 Oct 2018 20:29:34 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: Implement RFC2132 TFTP server name
slirp: Add sanity check for str option length
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qom')
0 files changed, 0 insertions, 0 deletions