[U-Boot-Users] Pull request: u-boot-testing new-image

Wolfgang Denk wd at denx.de
Wed Mar 26 11:15:16 CET 2008


In message <47EA14FC.5050508 at semihalf.com> you wrote:
>
> > in message <47E4D565.105 at semihalf.com> 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

-- 
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: wd at denx.de
I'd like to meet the man who invented sex and see what  he's  working
on now.




More information about the U-Boot mailing list