[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-ppc] [PATCH for-1.6] target-ppc: Fix POWER7+ model

From: Alexander Graf
Subject: Re: [Qemu-ppc] [PATCH for-1.6] target-ppc: Fix POWER7+ model
Date: Wed, 14 Aug 2013 18:19:01 +0200

On 14.08.2013, at 18:14, Anthony Liguori wrote:

> Already in 1.6:
> commit a7d6b9f084765a834110bb9a2a0329b1a96de792
> Author: Andreas Färber <address@hidden>
> Date:   Mon Aug 5 22:59:46 2013 +0200
>    target-ppc: Fix POWER7+ model

Oops, I must've missed the error output:

address@hidden:/home/agraf/release/qemu> git pw am 'target-ppc: Fix POWER7+ 
git commit --amend
total: 0 errors, 0 warnings, 25 lines checked

Your patch has no obvious style problems and is ready for submission.
Applying: target-ppc: Fix POWER7+ model
error: patch failed: target-ppc/cpu-models.c:1143
error: target-ppc/cpu-models.c: patch does not apply
error: patch failed: target-ppc/cpu-models.h:556
error: target-ppc/cpu-models.h: patch does not apply
Patch failed at 0001 target-ppc: Fix POWER7+ model
The copy of the patch that failed is found in:
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Heh - every apply after this obviously went bad too (POWER5 ones). Sigh. I 
guess I need another vacation :D


reply via email to

[Prev in Thread] Current Thread [Next in Thread]