Switched to a new branch '20181105163744.25139-1-kwolf@redhat.com'
Applying: block/vvfat: Fix crash when reporting error about too many files in directory
Using index info to reconstruct a base tree...
M	block/vvfat.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: block: replace "discard" literal with BDRV_OPT_DISCARD macro
Using index info to reconstruct a base tree...
M	block.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: qemu-io-cmds: Fix two format strings
Using index info to reconstruct a base tree...
M	qemu-io-cmds.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: block/qcow2: Don't take address of fields in packed structs
Using index info to reconstruct a base tree...
M	block/qcow2.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: block/qcow: Don't take address of fields in packed structs
Using index info to reconstruct a base tree...
M	block/qcow.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: block/qcow2-bitmap: Don't take address of fields in packed structs
Using index info to reconstruct a base tree...
M	block/qcow2-bitmap.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: crypto: initialize sector size even when opening with no IO flag
Using index info to reconstruct a base tree...
M	crypto/block-qcow.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: qcow2: Get the request alignment for encrypted images from QCryptoBlock
Using index info to reconstruct a base tree...
M	block/qcow2.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: block: change some function return type to bool
Using index info to reconstruct a base tree...
M	block/block-backend.c
M	include/sysemu/block-backend.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: iotests: make 083 specific to raw
Using index info to reconstruct a base tree...
M	tests/qemu-iotests/083
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: vpc: Don't leak opts in vpc_open()
Using index info to reconstruct a base tree...
M	block/vpc.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: block/vhdx: Don't take address of fields in packed structs
Using index info to reconstruct a base tree...
M	block/vhdx-endian.c
M	block/vhdx-log.c
M	block/vhdx.c
M	block/vhdx.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: block/vdi: Don't take address of fields in packed structs
Using index info to reconstruct a base tree...
M	block/vdi.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: quorum: Remove quorum_err()
Using index info to reconstruct a base tree...
M	block/quorum.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: quorum: Return an error if the blkverify mode has invalid settings
Using index info to reconstruct a base tree...
M	block/quorum.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: iotest: Test the blkverify mode of the Quorum driver
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	tests/qemu-iotests/081
M	tests/qemu-iotests/081.out
Falling back to patching base and 3-way merge...
Auto-merging tests/qemu-iotests/081.out
CONFLICT (content): Merge conflict in tests/qemu-iotests/081.out
Auto-merging tests/qemu-iotests/081
CONFLICT (content): Merge conflict in tests/qemu-iotests/081
Patch failed at 0001 iotest: Test the blkverify mode of the Quorum driver
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 16/36] iotest: Test the blkverify mode of the Quorum driver