From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 9 Aug 2021 10:04:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
X-Git-Tag: v6.1.0-rc3~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=632eda54043d6f26ff87dac16233e14b4708b967;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging

Fix for gnutls-crypto detection

# gpg: Signature made Mon 09 Aug 2021 10:43:32 BST
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini-gitlab/tags/for-upstream:
  meson: fix logic for gnutls check

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

632eda54043d6f26ff87dac16233e14b4708b967