Hi,
Thank you for submitting your patch series. This note is to inform
you that this patch series no longer applies against the latest
qemu.git tree.
If it's been at least a few days since you submitted this series,
please resubmit a new version of your patch series so it can be
considered for inclusion. If you submitted recently, please wait a
few days for patch review feedback and then resubmit.
Here is the output from git-am:
Applying: Move File operations to qemu-file.c
Using index info to reconstruct a base tree...
M savevm.c
<stdin>:312: trailing whitespace.
<stdin>:680: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging savevm.c
CONFLICT (content): Merge conflict in savevm.c
Failed to merge in the changes.
Patch failed at 0001 Move File operations to qemu-file.c
The copy of the patch that failed is found in:
/home/aliguori/.patches/git-working/.git/rebase-apply/patch
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Regards,
Anthony Liguori
