From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrDlg-0000W2-HZ for qemu-devel@nongnu.org; Fri, 04 Jan 2013 15:21:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TrDld-0000IJ-KX for qemu-devel@nongnu.org; Fri, 04 Jan 2013 15:21:28 -0500 Received: from e31.co.us.ibm.com ([32.97.110.149]:59174) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrDld-0000Hr-EW for qemu-devel@nongnu.org; Fri, 04 Jan 2013 15:21:25 -0500 Received: from /spool/local by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 4 Jan 2013 13:21:24 -0700 Message-Id: <201301042021.r04KL7Z9030205@d03av04.boulder.ibm.com> From: Anthony Liguori In-Reply-To: <1357252622-15209-1-git-send-email-stuart.yoder@freescale.com> Date: Fri, 04 Jan 2013 20:21:32 -0000 Subject: Re: [Qemu-devel] [PATCH] QEMU: PPC: set has-idle in guest device tree List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stuart Yoder , agraf@suse.de Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org 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 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".