Wolfgang Denk wrote:
> In message <[EMAIL PROTECTED]> you wrote:
>>> in message <[EMAIL PROTECTED]> you wrote:
>>>> Support for the new uImage format is available in the git repository at:
>>>>
>>>>      git://www.denx.de/git/u-boot-testing.git new-image
>>>>
>>>> The branch contains all patches related to the new uImage development
>>>> that have been posted to the list.
>>> Sorry, but can you please rebase your patches against current HEAD?
>>>
>>> I get merge conflicts:
>> [...]
>>> Please fix.
>> Dear Wolfgang,
>>
>> To summarize our off-list communication: merge conflicts of the
>> new-image branch with the current master have been resolved, new uImage
>> stuff is now ready for pulling from the master_merge_new-image branch.
> 
> I merged the new stuff into the master branch now.
> 
> This makes the u-boot-testing.git new-image branch obsolete, so I
> removed it.
> 
> Best regards,
> 
> Wolfgang Denk

...and the crowd cheers!  Thanks, Bartlomiej, for the planning, the 
work, and hanging tough through the acceptance process.

Best regards,
gvb

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users

Reply via email to