From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 2 Aug 2019 12:06:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/elmarco/tags/slirp-CVE-2019-14378-pull-request... 
X-Git-Tag: v4.1.0-rc4~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59;p=thirdparty%2Fqemu.git

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

Slirp CVE-2019-14378 pull request

# gpg: Signature made Fri 02 Aug 2019 12:17:24 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-CVE-2019-14378-pull-request:
  slirp: update with CVE-2019-14378 fix

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

9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59