Dear "Lv Terry-R65388", In message <1ae74f652ecb1440b73dd7c2c20842d1ac6...@zch01exm27.fsl.freescale.net> you wrote: > > I have tried to apply the patch on mainline.
You must be doing something wrong, then. I re-tested it, it applies cleanly: -> git-am -3 -i -u --whitespace=strip ~/Mail/U-Boot/7647 Commit Body is: -------------------------- Add initial support for Freescale mx51evk board The patch adds initial support for the Freescale mx51evk board. Network (FEC) and SD controller (fsl_esdhc) are supported. Signed-off-by: Stefano Babic <sba...@denx.de> Signed-off-by: Fred Fan <fanyef...@gmail.com> -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Add initial support for Freescale mx51evk board -> > The steps are: > > 1. Copy patch from > > http://article.gmane.org/gmane.comp.boot-loaders.u-boot/74754. > 2. Paste it to local text file patch. Eventually the patch gets mangled (white space corrupted) this way. > 3. Clone a new u-boot. > 4. Try "git apply patch". > > I encountered errors: > > r65...@szx32-17[/home/r65388/uboot-imx]602% git apply patch > error: patch failed: MAINTAINERS:152 > error: MAINTAINERS: patch does not apply Try using "git am", and avoid the copy & paste - save the page as text file instead. 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: w...@denx.de "It was the Law of the Sea, they said. Civilization ends at the wa- terline. Beyond that, we all enter the food chain, and not always right at the top." - Hunter S. Thompson _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
