[U-Boot] arm: comment request

Christian Riesch christian.riesch at omicron.at
Wed Oct 12 10:21:32 CEST 2011


Hello Heiko
I tried to apply your patches to the current master, since they are a
prerequisite for your enbw_cmc patches but

[U-Boot] cosmetic, post: Codingstyle cleanup
http://patchwork.ozlabs.org/patch/114742/

did not cleanly apply.

I got it from patchwork via
$ wget -nv http://patchwork.ozlabs.org/patch/114742/mbox/ -O 114742.patch
2011-10-12 10:20:09 URL:http://patchwork.ozlabs.org/patch/114742/mbox/
[10772/10772] -> "114742.patch" [1]
$ git am 114742.patch
Applying: cosmetic, post: Codingstyle cleanup
error: patch failed: post/post.c:95
error: post/post.c: patch does not apply
Patch failed at 0001 cosmetic, post: Codingstyle cleanup
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".

Best regards, Christian

On Wed, Oct 5, 2011 at 7:55 AM, Heiko Schocher <hs at denx.de> wrote:
> Hello Albert,
>
> can you comment/apply the following patches? As the new merge window is
> open, I think they can go to mainline:
>
> arm, logbuffer: make it compileclean
> http://patchwork.ozlabs.org/patch/114740/
>
> post, arm: make post support for arm compile clean
> http://patchwork.ozlabs.org/patch/114741/
>
> cosmetic, post: Codingstyle cleanup
> http://patchwork.ozlabs.org/patch/114742/
>
> arm, post: add missing post_time_ms for arm
> http://patchwork.ozlabs.org/patch/114743/
>
> Thanks!
>
> bye,
> Heiko
> --
> DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>


More information about the U-Boot mailing list