On Tuesday 11 December 2007, Haavard Skinnemoen wrote:
This patch tries to keep all lines in the cfi_flash driver below 80 columns. There are a few lines left which don't fit this requirement because I couldn't find any trivial way to break them (i.e. it would take some restructuring, which I intend to do in a later patch.)
I'm trying to apply your patches now but "git-am" fails:
[stefan@ubuntu u-boot-cfi-flash (master)]$ git-am [PATCH\ 1_6]\ cfi_flash:\ Break\ long\ lines.mbox Applying cfi_flash: Break long lines error: patch failed: drivers/mtd/cfi_flash.c:1204 error: drivers/mtd/cfi_flash.c: patch does not apply Patch failed at 0001. When you have resolved this problem run "git-am --resolved". If you would prefer to skip this patch, instead run "git-am --skip".
Could you please resolve this issue and resend the patch series? I just pushed the latest change from Bartlomiej Sieka into the cfi-flash master repo. Please rebase against this.
Thanks.
Best regards, Stefan
===================================================================== 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@denx.de =====================================================================