Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging master github/master
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 3 Apr 2020 14:30:11 +0000 (15:30 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 3 Apr 2020 14:30:11 +0000 (15:30 +0100)
commit146aa0f104bb3bf88e43c4082a0bfc4bbda4fbd8
tree7a10cb4db7b2757a238a958ec7aa9595d3614b09
parent64a3b4d53d344bd494bcf969ee89467b560c7ce0
parentae60ab7eb20715fa63cca1b0bb4493e160da51ce
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

# gpg: Signature made Fri 03 Apr 2020 12:50:57 BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  aio-posix: fix test-aio /aio/event/wait with fdmon-io_uring

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