Hi Detlev, 2011/4/27 Detlev Zundel <d...@denx.de>: > Hi, > >> Code clean up of cmd_nvedit.c by using checkpatch.pl. > > Thanks for taking the initiative to do some cleanup! > >> Signed-off-by: Macpaul Lin <macp...@andestech.com> > > Still, the patch fails for me: > > Applying: cmd_nvedit.c: clean up with checkpatch > Using index info to reconstruct a base tree... > error: patch failed: common/cmd_nvedit.c:807 > error: common/cmd_nvedit.c: patch does not apply > Did you hand edit your patch? > It does not apply to blobs recorded in its index. > Cannot fall back to three-way merge. > Patch failed at 0001 cmd_nvedit.c: clean up with checkpatch
Sorry when I replied your mail was doing other things busy so I didn't catch up your reply. I didn't hand edit my patch. Are you applying the Patch v3? Could you provide the git hash (commit number) to me. The 3 commits before this patch v3 is a01ebd: mpc52xx, digsy_mtc 71d19f30: rtc, rv3029 31e4139: Fix typo in #error Thanks. -- Best regards, Macpaul Lin _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
