Switched to a new branch '20190520161453.30723-1-kwolf@redhat.com'
Applying: block/file-posix: Truncate in xfs_write_zeroes()
Using index info to reconstruct a base tree...
M	block/file-posix.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: qcow2: Define and use QCOW2_COMPRESSED_SECTOR_SIZE
Using index info to reconstruct a base tree...
M	block/qcow2-cluster.c
M	block/qcow2-refcount.c
M	block/qcow2.c
M	block/qcow2.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: block: Use BDRV_REQUEST_MAX_BYTES instead of BDRV_REQUEST_MAX_SECTORS
Using index info to reconstruct a base tree...
M	block/io.c
M	qemu-io-cmds.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: qmp: forbid qmp_cont in RUN_STATE_FINISH_MIGRATE
Using index info to reconstruct a base tree...
M	qmp.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: iotest: fix 169: do not run qmp_cont in RUN_STATE_FINISH_MIGRATE
Using index info to reconstruct a base tree...
M	tests/qemu-iotests/169
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: nvme: fix copy direction in DMA reads going to CMB
Using index info to reconstruct a base tree...
M	hw/block/nvme.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: block: Add bdrv_try_set_aio_context()
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	block.c
M	include/block/block.h
M	include/block/block_int.h
Falling back to patching base and 3-way merge...
Auto-merging include/block/block_int.h
CONFLICT (content): Merge conflict in include/block/block_int.h
Auto-merging include/block/block.h
CONFLICT (content): Merge conflict in include/block/block.h
Auto-merging block.c
CONFLICT (content): Merge conflict in block.c
Patch failed at 0001 block: Add bdrv_try_set_aio_context()
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".
Failed to apply patch:
[Qemu-devel] [PULL 07/24] block: Add bdrv_try_set_aio_context()