OSDN Git Service

Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 30 Jul 2021 08:14:56 +0000 (09:14 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 30 Jul 2021 08:14:56 +0000 (09:14 +0100)
commitdbdc621be937d9efe3e4dff994e54e8eea051f7a
tree5fd9403d11229f0979fb18aca067c35a2c1e3ecc
parent7742fe64e5c2c2c9f9787d107b693eaac602eaae
parentcc8eecd7f105a1dff5876adeb238a14696061a4a
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 <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-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 <peter.maydell@linaro.org>
MAINTAINERS