Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
commit77f3804ab7ed94b471a14acb260e5aeacf26193f
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 2 Feb 2021 16:47:51 +0000 (2 16:47 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 2 Feb 2021 16:47:51 +0000 (2 16:47 +0000)
tree5275a7f99aff7db23f1603f8f5fa444d41c796e2
parentcf7ca7d5b9faca13f1f8e3ea92cfb2f741eb0c0e
parent26513a01741f51650f5dd716681995359794ba6f
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- Fix double processing of nodes in bdrv_set_aio_context()
- Fix potential hang in block export shutdown
- block/nvme: Minor tracing improvements
- iotests: Some more fixups for the 'check' rewrite
- MAINTAINERS: Add Vladimir as co-maintainer for Block Jobs

# gpg: Signature made Tue 02 Feb 2021 16:26:02 GMT
# gpg:                using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg:                issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  block: Fix VM size column width in bdrv_snapshot_dump()
  block/nvme: Trace NVMe spec version supported by the controller
  block/nvme: Properly display doorbell stride length in trace event
  iotests: Fix -makecheck output
  iotests: check: return 1 on failure
  iotests: Revert emulator selection to old behaviour
  iotests/297: pylint: ignore too many statements
  block: move blk_exp_close_all() to qemu_cleanup()
  block: Avoid processing BDS twice in bdrv_set_aio_context_ignore()
  MAINTAINERS: Add Vladimir as co-maintainer for Block Jobs

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