From: Anthony Liguori <aliguori@us.ibm.com>
To: Stuart Yoder <stuart.yoder@freescale.com>, agraf@suse.de
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH] QEMU: PPC: set has-idle in guest device tree
Date: Fri, 04 Jan 2013 20:21:32 -0000 [thread overview]
Message-ID: <201301042021.r04KL7Z9030205@d03av04.boulder.ibm.com> (raw)
In-Reply-To: <1357252622-15209-1-git-send-email-stuart.yoder@freescale.com>
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@us.ibm.com>
Below is the output from git-am:
Applying: QEMU: PPC: set has-idle in guest device tree
Using index info to reconstruct a base tree...
M hw/ppc/e500.c
M target-ppc/kvm.c
M target-ppc/kvm_ppc.h
Falling back to patching base and 3-way merge...
Auto-merging target-ppc/kvm_ppc.h
Auto-merging target-ppc/kvm.c
CONFLICT (content): Merge conflict in target-ppc/kvm.c
Auto-merging hw/ppc/e500.c
Failed to merge in the changes.
Patch failed at 0001 QEMU: PPC: set has-idle in guest device tree
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".
next prev parent reply other threads:[~2013-01-04 20:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-03 22:37 [Qemu-devel] [PATCH] QEMU: PPC: set has-idle in guest device tree Stuart Yoder
2013-01-04 9:14 ` Alexander Graf
2013-01-04 20:21 ` Anthony Liguori [this message]
2013-01-04 20:46 ` Alexander Graf
2013-01-07 9:46 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201301042021.r04KL7Z9030205@d03av04.boulder.ibm.com \
--to=aliguori@us.ibm.com \
--cc=agraf@suse.de \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=stuart.yoder@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).