Dear Remy,
In message <3efb10970901050724l6af77dbft1e048bad592cb...@mail.gmail.com> you
wrote:
>
> So, I have no problems with the separation Thomas has made to push the
> USB patches to the USB tree, and the basic board patches to you, but
Actually this is the correct thing to do.
> then I have to wait until you have the boards integrated. When the
Correct. First the generic support has to go in through the ARM tree,
and then you can apply the USB related patches on top of that.
> patches are in your tree, I believe we would not have merge conflicts
> in Wolfgangs tree, if my tree is pulled later than yours.
Actually the sequence should be that the ARM tree gets merged into
mainline first, then you update your USB repository from mainline
(thus getting all the new ARM stuff, too), then you can apply the USB
patches.
> I think it would get really complicated if you are going to pull the
> other (unstable) USB patches also in your tree..
This is something that I definitely do not want to see.
Jean-Chistophe, please do *NOT* pull any USB (or other non-ARM)
patches into the ARM repo.
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: w...@denx.de
There's another way to survive. Mutual trust -- and help.
-- Kirk, "Day of the Dove", stardate unknown
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
