OSDN Git Service

Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20201113-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 13 Nov 2020 12:40:36 +0000 (12:40 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 13 Nov 2020 12:40:36 +0000 (12:40 +0000)
commit6980c128b5cbc1d2a1b85609bb4d1e006e65109e
tree9f88709c355aa38b91e18dafdb18f1fbf25e3bb6
parentbe2df2ac6f6b9eeee21cc057de0a119ac30fbc60
parent172bc8520db1cb98d09b367360068a675fbc9413
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20201113-pull-request' into staging

fixes for console, audio, usb, vga.

# gpg: Signature made Fri 13 Nov 2020 12:29:44 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# 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/fixes-20201113-pull-request:
  xhci: fix nec-usb-xhci properties
  hw/display/cirrus_vga: Fix hexadecimal format string specifier
  hw/display/cirrus_vga: Remove debugging code commented out
  hw/usb/Kconfig: Fix USB_XHCI_NEC (depends on USB_XHCI_PCI)
  console: avoid passing con=NULL to graphic_hw_update_done()
  audio/jack: fix use after free segfault

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