[U-Boot] [PATCH V2 09/12] VIDEO: davinci: add framebuffer to da8xx

Anatolij Gustschin agust at denx.de
Wed Oct 12 11:06:27 CEST 2011


On Wed, 12 Oct 2011 10:42:21 +0200
Stefano Babic <sbabic at denx.de> wrote:

> On 10/11/2011 06:10 PM, Anatolij Gustschin wrote:
> > Hi Stefano,
> 
> Hi Anatolij,

Hi Stefano,
 
> > Thanks for these fixes. When applying this patch I see:
> > 
> > $ git am /tmp/\[PATCH\ V2\ 09_12\]\ VIDEO\:\ davinci\:\ add\ framebuffer\ to\ da8xx 
> > Applying: VIDEO: davinci: add framebuffer to da8xx
> > /home/ag/u-boot/u-boot-move-new-host/u-boot-video/.git/rebase-apply/patch:22: new blank line at EOF.
> > +
> > warning: 1 line adds whitespace errors.
> > 
> > This is due to the trailing empty line in
> > "arch/arm/include/asm/arch-davinci/da8xx-fb.h" I'think.
> > Can you please fix it also?
> 
> I have tried, no luck. I wonder that in my case I get a different line
> for error:
> 
> /home/stefano/Projects/imx/u-boot-imx/.git/rebase-apply/patch:14: new
> blank line at EOF.
> 
> Removing the empty line and the newline after the GIT version at the end
> of the file makes no change - I still get this error.
> 
> "new blank line" suggets me that it is something after the patch itself,
> but I have no idea where I should check. The patch seems correct. With
> "git am --whitespace=fix", the patch is applied, but there is no other
> hints about this issue.

git am complains since there is a blank line at the end of the
added arch/arm/include/asm/arch-davinci/da8xx-fb.h file.

OK, there is no need to resubmit this patch since it can be applied
with "--whitespace=fix" option.

Thanks,
Anatolij

--
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de


More information about the U-Boot mailing list