On Thu, Aug 7, 2008 at 15:02, William Juul <[EMAIL PROTECTED]> wrote: > On Thu, Aug 7, 2008 at 7:34 AM, Wolfgang Denk <[EMAIL PROTECTED]> wrote: >> >> In message <[EMAIL PROTECTED]> you wrote: >> > >> > I noticed that you are now maintaining a custodian tree which is >> > focused on NAND support in u-boot. Could you please tell me is there >> > any schedule or plan to publish your "testing" tree? >> >> What do you mean by "publish"? The branch is public all the time. It's >> available to everibode in the NAND custodian repository. See for >> example >> http://git.denx.de/?p=u-boot/u-boot-nand-flash.git;a=shortlog;h=refs/heads/testing > > I guess Hong Xu would like to know if there is a plan for merging this > branch in the main U-boot git repository. And if so, how and when? > Scott Wood has already signaled that he intends to merge this branch, > but I would also like to know about any progress in this matter.
Yes, William hit the point. Actually It seems my work is based on two different custodian trees, for example, Scott's NAND tree and u-boot-at91 tree. If the 2 two trees do not merge each other, sometimes I got screwed. I guess `git ' may help at this situation, but I don't know how. :-) I just wanted to know the status of the NAND tree. Maybe I did not express myself clearly in the last email. BR, Eric > Best regards > William Juul >> >> Best regards, >> >> Wolfgang Denk >> ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
