From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 23 Mar 2021 23:47:30 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210323-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=67c1115edd98f388ca89dd38322ea3fadf034523;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210323-pull-request' into staging

fixes for 6.0

# gpg: Signature made Tue 23 Mar 2021 15:36:06 GMT
# gpg:                using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20210323-pull-request:
  edid: prefer standard timings
  include/ui/console.h: Delete is_surface_bgr()
  qmp: add new qmp display-reload
  vnc: support reload x509 certificates for vnc
  crypto: add reload for QCryptoTLSCredsClass

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

67c1115edd98f388ca89dd38322ea3fadf034523