In message <[EMAIL PROTECTED]> you wrote: > > > I strongly recommend to use git-format-patch to generate trhe patch, > > and use git-send-email to send it. ... > Sorry about that. This patch applies cleanly to 1.3.3-rc3.
Maybe it did before you sent it by e-mail... Now it fails again: Applying Fix some typos error: patch failed: README:623 error: README: patch does not apply error: patch failed: cpu/arm920t/s3c24x0/usb.c:69 error: cpu/arm920t/s3c24x0/usb.c: patch does not apply error: patch failed: doc/README.nand-boot-ppc440:9 error: doc/README.nand-boot-ppc440: patch does not apply fatal: sha1 information is lacking or useless (README). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001. > I'm starting to familiarize myself with git, so I'll try to send > git-diffs next time. Thanks in advancve. I applied the few modifications manually this time, to limit your frustration ;-) Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED] I have made mistakes, but have never made the mistake of claiming I never made one. - James G. Bennet ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ U-Boot-Users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/u-boot-users
