Re: [Qemu-devel] [PATCH 06/12] cpus-common: move CPU list management to common code

[Paolo Bonzini]

On 05/09/2016 12:05, Alex Bennée wrote:
> What tree are you based off? git-am is having trouble applying this
> patch and the -3way fall back gets very confused:
> 
>     Applying: cpus-common: move CPU list management to common code
>     fatal: sha1 information is lacking or useless (exec.c).
>     error: could not build fake ancestor
>     Patch failed at 0001 cpus-common: move CPU list management to common code
>     The copy of the patch that failed is found in: .git/rebase-apply/patch
>     When you have resolved this problem, run "git am --continue".
>     If you prefer to skip this patch, run "git am --skip" instead.
>     To restore the original branch and stop patching, run "git am --abort".
> 
> I think this is because it looks to find real SHA1's to replay the diff.
> Your root commit (0308431) doesn't seem to exist in any public tree.

I have this patch in my tree:

Author: Igor Mammedov <address@hidden>  2016-07-25 14:47:12
Committer: Paolo Bonzini <address@hidden>  2016-08-30 14:35:52
Parent: 7846e37fa292b44fbc2be863c8b95a8ae7abeea8 (optionrom: cope with
multiple -O options)
Child:  8ea3d1b2bfcfb2637dcb38917650e0847bc31356 (util/qemu-sockets:
revert Yoda Conditions to normal)
Branches: for-2.6, remotes/mirror/for-2.6, remotes/mirror/safe-work
Follows: v2.7.0-rc4
Precedes:

    qtail: clean up direct access to tqe_prev field

    instead of accessing tqe_prev field dircetly outside
    of queue.h use macros to check if element is in list
    and make sure that afer element is removed from list
    tqe_prev field could be used to do the same check.

    Signed-off-by: Igor Mammedov <address@hidden>
    Message-Id: <address@hidden>
    Signed-off-by: Paolo Bonzini <address@hidden>


Paolo