Switched to a new branch 'cover.1487648787.git.ben@skyportsystems.com'
Applying: QEMU DMA: Add DMA write capability
Using index info to reconstruct a base tree...
M	src/fw/paravirt.c
M	src/fw/paravirt.h
Falling back to patching base and 3-way merge...
Auto-merging src/fw/paravirt.h
CONFLICT (content): Merge conflict in src/fw/paravirt.h
Auto-merging src/fw/paravirt.c
CONFLICT (content): Merge conflict in src/fw/paravirt.c
Failed to merge in the changes.
Patch failed at 0001 QEMU DMA: Add DMA write capability
The copy of the patch that failed is found in:
   /var/tmp/tmp8qupcbvm/.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:
[SeaBIOS] [PATCH v7 1/5] QEMU DMA: Add DMA write capability