Merge remote-tracking branch 'remotes/hreitz/tags/pull-block-2021-08-09' into staging
commite0d24696b9d9d78d621e3dedfcb3d2c094bdd8a3
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 9 Aug 2021 18:28:26 +0000 (9 19:28 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 9 Aug 2021 20:14:24 +0000 (9 21:14 +0100)
tree71a3d4d7ddf14174a7e9432fe9ee19396d9e5143
parent370ea52f725ab283e49b702b7bd5be73d0ff66bd
parenta6d2bb25cf945cd16f29a575055c6f1a1f9cf6c9
Merge remote-tracking branch 'remotes/hreitz/tags/pull-block-2021-08-09' into staging

Block patches for 6.1-rc3:
- Build fix for FUSE block exports
- iotest 233 fix

# gpg: Signature made Mon 09 Aug 2021 17:59:29 BST
# gpg:                using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg:                issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/hreitz/tags/pull-block-2021-08-09:
  tests: filter out TLS distinguished name in certificate checks
  block/export/fuse.c: fix musl build

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