Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging

Block layer patches - qcow2: Fix corruption on discard during write with COW - Remove the deprecated glusterfs block driver - graph-lock: fix missed wakeup in bdrv_graph_co_rdunlock() - ide: Fix deadlock between TRIM and drain - scsi: Fix discard_granularity for -drive if=scsi - blkdebug: Add 'delay-ns' option - qemu-io: Add 'aio_discard' command - Improve readability in HMP 'info blockstats' output - MAINTAINERS: Lukas Straub will maintain COLO block replication # -----BEGIN PGP SIGNATURE----- # # iQJFBAABCgAvFiEE3D3rFZqa+V09dFb+fwmycsiPL9YFAmoMlzsRHGt3b2xmQHJl # ZGhhdC5jb20ACgkQfwmycsiPL9bFhA//dxyOFcVJvYEGHM2JPQozf/+gmF+SVsDw # 6GKjiaTFU76nU8c5KrBsU8bVzOhLYcaDRJU6mXbUO3GQyOnng5zY67+HZ2uIGMdx # xbjNUn8+4spmN3siga/DssVWivSXf2hywmjk3/xBACQuzZ/hmNMzMqKEYJbergQG # T6aPq9D0fsXoseqoCrsifQo9qMRisNYFY8xG81smPFJ6v/riGg9RvZkgnjbX4VMk # NOE5r6ed9FKvwccKAx5xUFZ5aXwL6TI4APt50Rq4ackUL0PUE/1J1k+5elkJQ+hF # Az1rAKpJXSH13t+EaKbyJly1KnoXSPNsZW95dxPAxnB/EiejO88XOjHQnjl9KTUV # TtSdruJmXTCmx0vZC0s5y/E0GRBhR9e5NkfabbUHvZ8+QZNbgTtqzIWuceLZt/os # wZTy6AQHqFbDnOdhnKFwGGW2dqyRwteNtX/VoKCntvUF2AEZgsYHKshItk6EAi5n # ZXDGz73L4eJdmJIyWbWxXxm0BPRspJY20S+tTmnzlquCRWQMdqJMd4B0e4E7Ua+g # WxZuuFimG41Qk7Ssy+DYQ6TiJ7nwztCOpLb/XfciMYyrk+ms7gAqD103nMSe2hp/ # DpLcvhKOIKc2vDrboZT3AfGstj/PIIQzmjmPkdPCzt4AVOTND8V7gkoi8+nyMJ+O # NjIHxPFYGfc= # =3fqI # -----END PGP SIGNATURE----- # gpg: Signature made Tue 19 May 2026 13:00:43 EDT # 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 * tag 'for-upstream' of https://repo.or.cz/qemu/kevin: block: Improve readability in HMP 'info blockstats' output block/graph-lock: fix missed wakeup in bdrv_graph_co_rdunlock() iotests/046: Test that discard/write_zeroes wait for dependencies qcow2: Fix corruption on discard during write with COW qemu-io: Add 'aio_discard' command commit: Drain nodes across all of bdrv_commit() block: Add more defaults to DEFAULT_BLOCK_CONF block: Create DEFAULT_BLOCK_CONF macro MAINTAINERS: Rename Replication -> COLO block replication MAINTAINERS: Add myself as maintainer for replication Remove the deprecated glusterfs block driver ide-test: Test reset during TRIM ide-test: Factor out wait_dma_completion() ide: Clean up ide_trim_co_entry() to be idiomatic coroutine code ide: Minimal fix for deadlock between TRIM and drain block: Add flags parameter to blk_*_pdiscard() block: Add blk_co_start/end_request() and BDRV_REQ_NO_QUEUE blkdebug: Add 'delay-ns' option Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>