From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Fri, 4 Apr 2025 14:23:12 +0000 (-0400)
Subject: Merge tag 'pull-nbd-2025-04-03' of https://repo.or.cz/qemu/ericb into staging
X-Git-Tag: v10.0.0-rc3~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f1da6b4e86e760f4893ac8bc97d5648fc21079d;p=thirdparty%2Fqemu.git

Merge tag 'pull-nbd-2025-04-03' of https://repo.or.cz/qemu/ericb into staging

NBD patches for 2025-04-03

- revert iotest 162 workaround, now that qemu-nbd bug is fixed

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEEccLMIrHEYCkn0vOqp6FrSiUnQ2oFAmfvCUAACgkQp6FrSiUn
# Q2rQTgf8CRTvRe1lRBheUnC8nP8cqwZJSEXZjU/U82R2ZYYvKbreY5HHbn8EeaUr
# 7CeJW0lnitw3KLXAjUOQnXjjW89lh9adKIcReDnO014AW1zW3a6J0KgCLQxRBja5
# k4h1SQFMyaZJAwPNcYMR9+bYfCGotMxITUeKopPOy3LI5HqKW+sLzt8OGGXvJy06
# 4w/KmaFlYH5Z9CoGISjGhXBN0l6K+BAcU7nEOcl1nByceW3Dy2od3dci4bko4B8X
# qGr+om5Md4zK2335iZ+nVooFn/4Rh4oLKm5DeF4pVBl9tqKd+S+TeleOGP4SDlt+
# PwTab1pAFyx9f/vPE1mrwhfXO1t+eA==
# =Cyv0
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 03 Apr 2025 18:18:40 EDT
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* tag 'pull-nbd-2025-04-03' of https://repo.or.cz/qemu/ericb:
  Revert "iotests: Stop NBD server in test 162 before starting the next one"

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

0f1da6b4e86e760f4893ac8bc97d5648fc21079d