[U-Boot] [PATCH v5] powerpc: Partialy restore core of mpc8xx

[LEROY Christophe]

Wolfgang Denk <wd at denx.de> a écrit :

> Dear Christophe,
>
> In message <20170629165215.9672C67501 at pc13941vm.idsi0.si.c-s.fr> you wrote:
>>
>> This commit partially restores support for the 8xx, with the
>> following limitations:
>
> Hmm... may I ask what you use as reference for this patch?  It
> appears I cannot apply it to curent mainline:
>
> -> git-am -3 -i -u --whitespace=strip /tmp/share/patch
> Commit Body is:
> --------------------------
> powerpc: Partialy restore core of mpc8xx
>
> CS Systemes d'Information (CSSI) manufactures 8xx boards for
> critical communication systems. Those boards have been
> ...
> being maintained on the 8xx area. A later patch will add
> those boards to the tree.
>
> Signed-off-by: Christophe Leroy <christophe.leroy at c-s.fr>
> --------------------------
> Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: y
> Applying: powerpc: Partialy restore core of mpc8xx
> fatal: sha1 information is lacking or useless (README).
> error: could not build fake ancestor
> Patch failed at 0001 powerpc: Partialy restore core of mpc8xx
> The copy of the patch that failed is found in: .git/rebase-apply/patch
> When you have resolved this problem, run "git am -i --continue".
> If you prefer to skip this patch, run "git am -i --skip" instead.
> To restore the original branch and stop patching, run "git am -i --abort".
>
>

I did rebase it to the mainline a few minutes before sending it.
Did you apply 4xx removal patch first ? I wrote it in the patch after  
the ---, it is the way we do it in Linux, maybe you do differently in  
uboot ?

Regards
Christophe

>
>
> Best regards,
>
> Wolfgang Denk
>
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
> If something is different, it's either better or worse,  and  usually
> both.                                                    - Larry Wall