From: Peter Maydell Date: Fri, 30 Jul 2021 08:14:56 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into... X-Git-Tag: v6.1.0-rc2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbdc621be937d9efe3e4dff994e54e8eea051f7a;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging Pull request The main fix here is for io_uring. Spurious -EAGAIN errors can happen and the request needs to be resubmitted. The MAINTAINERS changes carry no risk and we might as well include them in QEMU 6.1. # gpg: Signature made Thu 29 Jul 2021 17:22:20 BST # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi " [full] # gpg: aka "Stefan Hajnoczi " [full] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha-gitlab/tags/block-pull-request: MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver block/io_uring: resubmit when result is -EAGAIN MAINTAINERS: add Stefano Garzarella as io_uring reviewer Signed-off-by: Peter Maydell --- dbdc621be937d9efe3e4dff994e54e8eea051f7a