| Message ID | 1304109547-7854-1-git-send-email-s-paulraj@ti.com |
|---|---|
| State | Accepted |
| Headers | show |
Hi Sandeep, Le 29/04/2011 22:39, s-paulraj@ti.com a écrit : > The following changes since commit e2b1fb98dab08f18e456fd8d846440fe81567785: > Sandeep Paulraj (1): > Merge branch 'master' of git://git.denx.de/u-boot-arm > > are available in the git repository at: > > git://git.denx.de/u-boot-ti.git master > > Ben Gardiner (1): > da850evm: fix NAND WSTROBE and TA timings > > board/davinci/da8xxevm/da850evm.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Actually commit e2b1fb98dab08f18e456fd8d846440fe81567785 is a merge commit of the u-boot-arm/master branch into yours, whereas the pull request should have been based on the u-boot-arm/master branch itself, commit 2fa8ca98c37d5b1bb0328b19ddb7e9d162cd9683 (seems you have done a merge of u-boot-arm/master into u-boot-ti rather than a rebase of u-boot-ti onto u-boot-arm). However, seeing as there is only one commit in the request, I'll simply cherry-pick it on top of my master and consider it as: Applied, thanks. Prafulla : take note that u-boot-arm/master has moved; if you have not already prepared your pull request, please rebase it, sorry for the inconvenience. Amicalement,
> -----Original Message----- > From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] > Sent: Saturday, May 07, 2011 3:43 PM > To: s-paulraj@ti.com > Cc: u-boot@lists.denx.de; Prafulla Wadaskar > Subject: Re: Please pull u-boot-ti/master > > Hi Sandeep, > > Le 29/04/2011 22:39, s-paulraj@ti.com a écrit : > > The following changes since commit > e2b1fb98dab08f18e456fd8d846440fe81567785: > > Sandeep Paulraj (1): > > Merge branch 'master' of git://git.denx.de/u-boot-arm > > > > are available in the git repository at: > > > > git://git.denx.de/u-boot-ti.git master > > > > Ben Gardiner (1): > > da850evm: fix NAND WSTROBE and TA timings > > > > board/davinci/da8xxevm/da850evm.c | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > Actually commit e2b1fb98dab08f18e456fd8d846440fe81567785 is a merge > commit of the u-boot-arm/master branch into yours, whereas the pull > request should have been based on the u-boot-arm/master branch itself, > commit 2fa8ca98c37d5b1bb0328b19ddb7e9d162cd9683 (seems you have done a > merge of u-boot-arm/master into u-boot-ti rather than a rebase of > u-boot-ti onto u-boot-arm). > > However, seeing as there is only one commit in the request, I'll simply > cherry-pick it on top of my master and consider it as: > > Applied, thanks. > > Prafulla : take note that u-boot-arm/master has moved; if you have not > already prepared your pull request, please rebase it, sorry for the > inconvenience. Hi Albert Thanks, I will do it. Regards.. Prafulla . . > > Amicalement, > -- > Albert.
The following changes since commit e2b1fb98dab08f18e456fd8d846440fe81567785: Sandeep Paulraj (1): Merge branch 'master' of git://git.denx.de/u-boot-arm are available in the git repository at: git://git.denx.de/u-boot-ti.git master Ben Gardiner (1): da850evm: fix NAND WSTROBE and TA timings board/davinci/da8xxevm/da850evm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)