[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH] QEMU: PPC: set has-idle in guest device tree
From: |
Alexander Graf |
Subject: |
Re: [Qemu-ppc] [PATCH] QEMU: PPC: set has-idle in guest device tree |
Date: |
Fri, 4 Jan 2013 21:46:57 +0100 |
Am 04.01.2013 um 21:21 schrieb Anthony Liguori <address@hidden>:
> 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.
Great idea, but not patricularly useful for ppc patches :). Could you please
just omit patches that have a CC on qemu-ppc? :)
Alex
>
> 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 <address@hidden>
>
> 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".
>