<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
<META content="MSHTML 6.00.2900.3243" name=GENERATOR></HEAD>
<BODY>
<DIV dir=ltr align=left><SPAN class=485513217-23012008><FONT face=Arial
color=#0000ff size=2>David,</FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=485513217-23012008><FONT face=Arial
color=#0000ff size=2></FONT></SPAN> </DIV>
<DIV dir=ltr align=left><SPAN class=485513217-23012008> <FONT
face=Arial color=#0000ff size=2>Matthew's patch is based of commit f18889c2f1...
Jan 17 09:35:26 2008 +0100 Merge branch 'master' of
git+ssh://10.10.0.7/home/wd/git/u-boot/master. When you cloned the latest as
today, there are dozen of patches since then, so the patches show errors when
you applied.</FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=485513217-23012008><FONT face=Arial
color=#0000ff size=2></FONT></SPAN> </DIV>
<DIV dir=ltr align=left><SPAN class=485513217-23012008> <FONT
face=Arial color=#0000ff size=2>First, you create a new branch based of master
if you use the main stream branch. git-branch newbranch master. Change your
branch to newbranch. git-checkout newbranch. Reset to the commit mentioned
above. git-reset --hard f18889c2f1... Update the two patches from Matthew (Make
sure no unwrap text and unix file format) git-apply --whitespace=strip
patch. Use git-add to apply all the new files just added, then
temporary create a commit git-commit (Otherwise, rebase won't work). To
merge with updated u-boot. git-rebase master newbranch. There maybe other
methods to apply the patch, but this is the method I used so
far.</FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=485513217-23012008><FONT face=Arial
color=#0000ff size=2></FONT></SPAN> </DIV>
<DIV dir=ltr align=left><SPAN class=485513217-23012008> <FONT
face=Arial color=#0000ff size=2>Hope this help.</FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=485513217-23012008><FONT face=Arial
color=#0000ff size=2></FONT></SPAN> </DIV>
<DIV dir=ltr align=left><SPAN class=485513217-23012008><FONT face=Arial
color=#0000ff size=2>Regards,</FONT></SPAN></DIV>
<DIV dir=ltr align=left><SPAN class=485513217-23012008><FONT face=Arial
color=#0000ff size=2>TsiChung</FONT></SPAN></DIV></BODY></HTML>