Switched to a new branch '20260521134943.1714527-1-berrange@redhat.com'
Applying: io: invert the return semantics of qio_channel_flush
Using index info to reconstruct a base tree...
M	include/io/channel-socket.h
M	include/io/channel.h
M	io/channel-socket.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: crypto: fix client side anonymous TLS credentials
Using index info to reconstruct a base tree...
M	crypto/tlscredsanon.c
M	tests/unit/test-crypto-tlssession.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: python: bump qemu.qmp to v0.0.6
Using index info to reconstruct a base tree...
M	python/scripts/vendor.py
A	python/wheels/qemu_qmp-0.0.5-py3-none-any.whl
M	pythondeps.toml
Falling back to patching base and 3-way merge...
Auto-merging python/wheels/qemu_qmp-0.0.6-py3-none-any.whl
No changes -- Patch already applied.
Applying: gitlab: ensure all meson jobs capture build/meson-logs by default
Using index info to reconstruct a base tree...
M	.gitlab-ci.d/buildtest-template.yml
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: iotests: print reason when I/O test is skipped in TAP mode
Using index info to reconstruct a base tree...
M	tests/qemu-iotests/testrunner.py
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: iotests: remove redundant meson suite for iotests
Using index info to reconstruct a base tree...
M	tests/qemu-iotests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/qemu-iotests/meson.build
CONFLICT (content): Merge conflict in tests/qemu-iotests/meson.build
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0006 iotests: remove redundant meson suite for iotests
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".