Hi Marek,
On Mon, 5 May 2014 19:46:13 +0200, Marek Vasut marex@denx.de wrote:
On Monday, May 05, 2014 at 06:46:36 PM, Stephen Warren wrote:
Albert,
I was wondering when the next pull request for u-boot-arm/master -> u-boot/master was likely to be?
I asked because some changes to the Tegra USB driver went through the u-boot-tegra/master and hence are now in u-boot-arm/master, but not in u-boot-usb/master. I have some more USB driver changes which rely on the earlier USB patches, and these should really go through u-boot-usb/master rather than the Tegra/ARM tree. For this to happen, u-boot-usb/master needs to contain the patches currently in u-boot-arm/master, and the best way for that to happen is for those patches to get into u-boot/master so that u-boot-usb/master can merge them.
Or, should Marek just merge u-boot-arm/master into his tree directly?
I will not merge u-boot-arm/master into my tree, no. I will wait for the higher- ups to solve this ... Albert, we're waiting :b
On it now.
Best regards, Marek Vasut
Amicalement,