[U-Boot] [PATCH v2 2/3] tegra: move TEGRA_DEVICE_SETTINGS to tegra-common-post.h

[Stephen Warren]

On 10/23/2012 04:01 PM, Marek Vasut wrote:
> Dear Stephen Warren,
> 
>> On 10/23/2012 01:27 AM, Marek Vasut wrote:
>>> Dear Allen Martin,
>>>
>>>> Move environment settings for stdin/stdout/stderr to
>>>> tegra-common-post.h and generate them automaticaly based on input
>>>> device selection.
>>>>
>>>> Signed-off-by: Allen Martin <amartin at nvidia.com>
>>>
>>> 2/3 and 3/3 should go through tegra, thanks
>>
>> Although of course patches 2 & 3 depend on patch 1. So, the process
>> would have to be:
>>
>> 1) Apply patch 1 to USB tree.
>> 2) Send pull request for USB to main U-Boot repo.
>> 3) Pull request actioned.
>> 4) Wait until latest u-boot/master is picked in u-boot/arm and hence
>> u-boot/tegra.
>> 5) Apply patches 2 & 3 to the Tegra tree.
>>
>> That's quite a long round-trip. What's the typical delay between (1) and
>> (2) or (3) and (4)?
>>
>> In the Linux kernel, this would be handled by putting patch (1) into a
>> topic branch on its own, which can then be merged into both the USB
>> branch and immediately into Tegra's branch. Of course, that all relies
>> on never rebasing during pull requests (otherwise, the branch with patch
>> 1 might end up being applied as two different commits when merging into
>> u-boot/master); something which apparently isn't acceptable for U-Boot:-(
> 
> Fine, then if you agree, I'll pull them all through usb tree ?

That's up to Tom Warren; he gets back from vacation in a couple days.
Taking it all through the USB tree might not be best either, since there
are merge conflicts with some Tegra patches that are already queued up,
but I'll let Tom comment on what he wants to do.