Hi Detlev,
Wrt the whitespace: I'll take more care next time.
wrt the patch not applying: did you apply the patches 1 to 4 first? I'm especially triggered by the fact that you are applying p1, but this is patch 5. Also your testing tree does not show that the others have been applied (but of course it could be a different git or you could have unrolled it them).
The i2c patches cannot be applied out of order!! The new i2c read command is added to the command table to at least that patch need to be applied first.
I've ran the patches on the main git head on two different systems and did not run into problems. Also I just did do a checkout of the file just before the patch was applied. I could apply the patch on it without a problem. I also did a diff on the patch as I've sent it and the email copy is equal to the copy on my system.
Frans (puzzled).
2010/2/26 Detlev Zundel dzu@denx.de:
Hi Frans,
[dzu@pollux u-boot-testing (master)]$ git am ~/p1 Applying: cmd_i2c.c: added i2c read to memory function /work/dzu/git/u-boot-testing/.git/rebase-apply/patch:95: trailing whitespace. #if defined(CONFIG_I2C_MUX) error: patch failed: common/cmd_i2c.c:1272 error: common/cmd_i2c.c: patch does not apply Patch failed at 0001 cmd_i2c.c: added i2c read to memory function 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".
You really want to run "scripts/checkpatch.pl" from a Linux source tree on your patches to catch such style problems (beware that in U-Boot we use common sense for the output and tolerate some warnings). Whitespace problems can also be easily seen if you do a "git config --global color.diff=auto". Then such problems can be spotted in "git diff" output.
Currently I don't have time to diagnose the error in line 1272 - maybe you can do that.
Cheers Detlev
-- I have always observed that the pretensions of all people are in exact inverse ratio to their merits; this is one of the axioms of morals. -- Joseph Lagrange -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu@denx.de