The Cc header of the message looks broken. It contained: Cc: =?utf-8?q?kvm=40vger=2Ekernel=2Eorg=2C_Gleb_Natapov_=3Cgleb=40redhat=2E?=.=?utf-8?q?com=3E=2C_libvir-list=40redhat=2Ecom=2C_Marcelo_Tosatti_=3Cmtosat?=.=?utf-8?q?ti=40redhat=2Ecom=3E=2C_Igor_Mammedov_=3Cimammedo=40redhat=2Ecom?=.=?utf-8?q?=3E=2C_Jiri_Den
On Fri, Jan 04, 2013 at 08:21:22PM -0000, Anthony Liguori wrote: > Hi, > > This is an automated message generated from the QEMU Patches. > Thank you for submitting this patch. This patch no longer applies to > qemu.git. Cool. :-) > > This may have occurred due to: > > 1) Changes in mainline requiring your patch to be rebased and re-tested. > > 2) Sending the mail using a tool other than git-send-email. Please use > git-send-email to send patches to QEMU. > > 3) Basing this patch off of a branch that isn't tracking the QEMU > master branch. If that was done purposefully, please include the name > of the tree in the subject line in the future to prevent this message. > > For instance: "[PATCH block-next 1/10] qcow3: add fancy new feature" What should I do if the patch requires other patches that are on the mailing list but no git tree yet? That was the case, here (the series depends on the disable-kvm_mmu_op series I sent previously today). > > 4) You no longer wish for this patch to be applied to QEMU. No additional > action is required on your part. > > Nacked-by: QEMU Patches <aligu...@us.ibm.com> > > Below is the output from git-am: > > Applying: target-i386: kvm: -cpu host: Use GET_SUPPORTED_CPUID for SVM > features > Applying: target-i386: kvm: Enable all supported KVM features for -cpu > host > Applying: target-i386: check/enforce: Fix CPUID leaf numbers on error > messages > fatal: sha1 information is lacking or useless (target-i386/cpu.c). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0003 target-i386: check/enforce: Fix CPUID leaf numbers > on error messages > The copy of the patch that failed is found in: > /home/aliguori/.patches/qemu-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". > -- Eduardo
