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

[Albert ARIBAUD]

Hi Tom,

On Mon, 10 Dec 2012 14:15:10 -0700, Tom Warren
<twarren.nvidia at gmail.com> wrote:
> 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.

As for what I did, it was simply to try and merge u-boot-tegra into
u-boot-arm.

Regarding u-boot-usb, it is not usually pulled into u-boot-arm; but
if it was needed by, and pulled into, u-boot-tegra, then it would have
automatically been pulled into u-boot-arm when I fetched u-boot-tegra,
and merged when I did the merge. Would it not?

Amicalement,
-- 
Albert.