[U-Boot-Users] Please pull 85xx

Wolfgang Denk wd at denx.de
Thu Dec 27 21:12:47 CET 2007

In message <200712271922.50572.sr at denx.de> you wrote:
> > When I'm pulling the libfdt repo, I will check what's in there, but
> > when I pull the 4xx repo, I do NOT want to have to check any other
> > repo in parallel, too.
> If I understand this correctly, then recent git versions are capable of 
> handling such cases without problems. Meaning pulling patches from another 
> repo, that are allready present should cause no problems.

Yes, *if* they are present, and if they are identical.

If I decide not to pull libfdt yet  for  some  reason  (for  example,
because  I  rejected  partrs  of  it and now wait for a new version),
pulling from your repo will sneak in the code I intended to reject.

If your version and what I  pulled  (and  eventually  modified)  from
libfdt differ, who knows what the end resulkt would look like?

> > Sorry, if there are such dependencies, then please drop me a note and
> > we will find a way to dort it out. YOu know that I will try  to  help
> > if somebody has a reasonable request.
> I did ask you once or twice about this fdt repo, but I should have have been 
> more insistant.

Sorry, it seems I did not understand the importance of that request.

> I'll try to remove the already commited fdt patches from my repo and merge 
> with mainline before asking you to pull from the 4xx repo. OK?

Just rebase your stuff against current version and this should resolve
easily, I guess.

Here it was easy, as I accepted libfdt as it  was,  an  you  probably
have the correct code, too. But it could have been worse.

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
"When the only  tool  you  have  is  a  hammer,  you  tend  to  treat
everything as if it were a nail."                    - Abraham Maslow

More information about the U-Boot mailing list