Re: [libvirt] [PATCH 0/9] target-i386: make "enforce" flag work as it should
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.
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"
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 <aliguori(a)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/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".