tree f3350b652dc03533a8c47455c7b3f12c376a1960
parent 3461487523b897d324e8d91f3fd20ed55f849544
parent 9c15f57891af7c2cb3baf2d66a1b1f3f87a665ba
author Peter Maydell <peter.maydell@linaro.org> 1595961843 +0100
committer Peter Maydell <peter.maydell@linaro.org> 1595961843 +0100
mergetag object 9c15f57891af7c2cb3baf2d66a1b1f3f87a665ba
 type commit
 tag slirp-pull-request
 tagger Marc-André Lureau <marcandre.lureau@redhat.com> 1595946609 +0400
 
 slirp: update to latest stable-4.2 branch
 -----BEGIN PGP SIGNATURE-----
 
 iQJQBAABCAA6FiEEh6m9kz+HxgbSdvYt2ujhCXWWnOUFAl8gNnEcHG1hcmNhbmRy
 ZS5sdXJlYXVAcmVkaGF0LmNvbQAKCRDa6OEJdZac5cSVD/9qQaONy0CMABgYpIlK
 VwhArWfHhphxQvB8ozH0mu+B5GbYaAfoDU5KAplL/+y88SwYTYwAz99XJm4e8lCp
 ahZ6ng1T9vTV0DIB1KkWYaVznXx1U7U3lLIlVZyFLGZXxYZbCmV+bjwNxegjgh+R
 2htRCrJVHOUNpGS8i8rZQagosC4q9YYF+wgsSumEVBOVqVDPnoXLKgL4UJJV6s8o
 fG1LjRNU3IZkZpCXu7vhXl/YQgFv8k9Wx5RDfdfbL+GFZuHNE75y9t55xwS6kCoY
 2TXWJbibnYhBSpoOUQjEDNl+VXLjjdO4T9aQHZnqbVUNMB2l7f/5ZwT7BFJfgrIp
 WoahoKgdZlcfy2bLb/t0G3nrJLAhFdMSbilos3CAcky5izdR5PoIC1Rjf1LUrdbq
 DYbAkrbmYdhcNm+Kk9hTGMAS2xwO3ZZzYyIt8nExtrsVm9eKcGgLV/9OkI1Q7jUW
 R8Qab2WbUiFC9E5t7GG1wuczjNZBwcBkuR74FTX0VdXW+YGOfTiJjtNLQAc3OqYT
 CuUK5+BJtqh65xF3WIRktWjsdk+PDvV/H4CNHTDh8J4+JjyhGs176xkQnb4KRetw
 1JL0F1Mvm/7G939fBaRnI3+/yg7MyeOPNhSFDYLosPi+2XPSL1u+KbXN+F7mrjds
 kRu+pANaMFtDHxbgF3tB+MNG+w==
 =kTid
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into staging

slirp: update to latest stable-4.2 branch

# gpg: Signature made Tue 28 Jul 2020 15:30:09 BST
# gpg:                using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
# gpg:                issuer "marcandre.lureau@redhat.com"
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full]
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/slirp-pull-request:
  slirp: update to latest stable-4.2 branch
  test-char: abort on serial test error

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>