Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
commitf1e748d27996e0cd8269db837a32e453dd55930a
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 23 Mar 2020 20:54:24 +0000 (23 20:54 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 23 Mar 2020 20:54:24 +0000 (23 20:54 +0000)
tree23301194ddf6bd18423b3651c196526caf27f9a4
parentc532b954d96f96d361ca31308f75f1b95bd4df76
parentff807d559205a434fd37d3343f01a0ab128bd190
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

# gpg: Signature made Mon 23 Mar 2020 19:24:02 GMT
# 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 io_uring with external events

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