[U-Boot] Conflicting commits for seaboard USB keyboard handling

[Tom Warren]

u-boot-arm/master and u-boot-tegra/next should have the same base
commit (b8a7c46), so merging them isn't a big deal, and goes smoothly
for me. If I then take u-boot/master and merge it, I see a conflict in
drivers/power/power_fls.c and include/configs/mx35pdk.h and
mx53loco.h, but no problems with Tegra code.  I could resolve those
conflicts and continue with the rebase, but ...

Correct me if I'm wrong, but u-boot-tegra and u-boot-usb are both
pulled into u-boot-arm, and (I thought) u-boot-arm is then (or
eventually) pulled into u-boot/master.  I don't pull from u-boot-usb
(or any other 'sub' repo), since that would appear to create conflicts
when Albert pulls into u-boot-arm. I also don't pull from
u-boot/master, since it's essentially 2 levels above me.

Albert - if you can, please show me exactly what fetch/merge or rebase
command sequence is failing for you. I'm still not clear on what the
exact merge conflict error is, nor how to fix it.  Or Allen, if you
have better visibility into exactly what the merge conflict is w/Tegra
that I'm just not seeing, maybe you could provide either a patchset
that'll fix it or steps I can take to do the same.

Thanks,

Tom

On Mon, Dec 10, 2012 at 12:25 PM, Allen Martin <amartin at nvidia.com> wrote:
> On Mon, Dec 10, 2012 at 08:59:59AM -0800, Tom Warren wrote:
>> Albert,
>>
>> On Mon, Dec 10, 2012 at 9:25 AM, Tom Warren <twarren.nvidia at gmail.com> wrote:
>> > Will do.
>> >
>> > On Sat, Dec 8, 2012 at 11:03 PM, Albert ARIBAUD
>> > <albert.u.boot at aribaud.net> wrote:
>> >> Hello,
>> >>
>> >> It seems like two commits 5ddcc38b (in u-boot, committed by Marek)
>> >> 29f3e3f2 (in u-boot-arm, committed by Tom from u-boot-tegra) are
>> >> conflicting on the seaboard configuration header file for USB (and
>> >> possibly other areas).
>>
>> Looking at Allen's commit, it only added CONFIG_USB_KEYBOARD (plus a
>> comment) to seaboard.h. That should be conflict-free with my rename of
>> TEGRA20_ to TEGRA_ in seaboard.h.  Looking at Allen's patchset (which
>> is marked 'Awaiting upstream' in Patchwork, BTW), you can see that my
>> patch had already been applied to Allen's source
>> (CONFIG_TEGRA_KEYBOARD instead of CONFIG_TEGRA20_KEYBOARD precedes
>> Allen's CONFIG_USB_KEYBOARD in seaboard.h).
>>
>> I pulled TOT u-boot/master, and both commits seem to be just fine for
>> seaboard.h. It builds fine, too.
>>
>> Can you be more explicit about the exact conflict, including which
>> exact repos & branches you are merging when you see the conflict?
>
> I can see the conflict if I checkout u-boot-arm/master and then merge
> u-boot-tegra/next and u-boot/master.  If we pull the following commit
> from u-boot/master into u-boot-tegra/next it helps:
>
> 5ddcc38 tegra: Enable USB keyboard
>
> There's still a conflict between the LCD config file changes and the
> USB keyboard config file changes, but it's pretty straightforward to
> resolve.
>
> -Allen
> --
> nvpublic