On Wed, Dec 19, 2012 at 5:32 PM, Allen Martin wrote:
> On Wed, Dec 19, 2012 at 02:42:24PM -0800, Albert ARIBAUD wrote:
>> Hi Allen,
>>
>> > Hi Albert, I did a merge of u-boot/master into u-boot-arm/master and
>> > resolved the conflicts and I've pushed the result to:
>> >
>> > git://github.com/ar
On Wed, Dec 19, 2012 at 02:42:24PM -0800, Albert ARIBAUD wrote:
> Hi Allen,
>
> > Hi Albert, I did a merge of u-boot/master into u-boot-arm/master and
> > resolved the conflicts and I've pushed the result to:
> >
> > git://github.com/arm000/u-boot.git
> > branch: u-boot-arm-merge-resolved
> >
Hi Allen,
> Hi Albert, I did a merge of u-boot/master into u-boot-arm/master and
> resolved the conflicts and I've pushed the result to:
>
> git://github.com/arm000/u-boot.git
> branch: u-boot-arm-merge-resolved
>
> I resolved all the conflicts, but the only ones I claim I did
> correctly were
On Wed, Dec 19, 2012 at 11:37:26AM -0800, Albert ARIBAUD wrote:
> Hi Stephen,
>
> On Tue, 18 Dec 2012 23:04:09 -0700, Stephen Warren
> wrote:
> > On 12/18/2012 06:08 PM, Allen Martin wrote:
> > ...
> > > The other alternative is I could provide the conflict resolved files
> > > or instructions fo
Hi Stephen,
On Tue, 18 Dec 2012 23:04:09 -0700, Stephen Warren
wrote:
> On 12/18/2012 06:08 PM, Allen Martin wrote:
> ...
> > The other alternative is I could provide the conflict resolved files
> > or instructions for how to resolve.
>
> Aren't the two sets of files that conflict those that are
On 12/18/2012 06:08 PM, Allen Martin wrote:
...
> The other alternative is I could provide the conflict resolved files
> or instructions for how to resolve.
Aren't the two sets of files that conflict those that are already in
u-boot/master and u-boot-arm/master? If so, only Albert can resolve the
On Tue, Dec 18, 2012 at 03:59:36PM -0800, Tom Warren wrote:
> Allen,
>
> On Tue, Dec 18, 2012 at 11:06 AM, Allen Martin wrote:
> > On Tue, Dec 18, 2012 at 08:43:18AM -0800, Tom Warren wrote:
> >> Allen,
> >>
> >> On Mon, Dec 17, 2012 at 3:22 PM, Allen Martin wrote:
> >> > On Mon, Dec 17, 2012 at
Allen,
On Tue, Dec 18, 2012 at 11:06 AM, Allen Martin wrote:
> On Tue, Dec 18, 2012 at 08:43:18AM -0800, Tom Warren wrote:
>> Allen,
>>
>> On Mon, Dec 17, 2012 at 3:22 PM, Allen Martin wrote:
>> > On Mon, Dec 17, 2012 at 02:13:29PM -0800, Tom Warren wrote:
>> >> Allen,
>> >>
>> >> If you come up
On Tue, Dec 18, 2012 at 08:43:18AM -0800, Tom Warren wrote:
> Allen,
>
> On Mon, Dec 17, 2012 at 3:22 PM, Allen Martin wrote:
> > On Mon, Dec 17, 2012 at 02:13:29PM -0800, Tom Warren wrote:
> >> Allen,
> >>
> >> If you come up with patches to fix the seaboard config files, I can
> >> add them to
Allen,
On Mon, Dec 17, 2012 at 3:22 PM, Allen Martin wrote:
> On Mon, Dec 17, 2012 at 02:13:29PM -0800, Tom Warren wrote:
>> Allen,
>>
>> If you come up with patches to fix the seaboard config files, I can
>> add them to my copy of u-boot-tegra/master, push it to denx, and
>> generate a pull requ
On Mon, Dec 17, 2012 at 02:13:29PM -0800, Tom Warren wrote:
> Allen,
>
> If you come up with patches to fix the seaboard config files, I can
> add them to my copy of u-boot-tegra/master, push it to denx, and
> generate a pull request for Albert if you want.
>
The conflicting changes have already
Allen,
If you come up with patches to fix the seaboard config files, I can
add them to my copy of u-boot-tegra/master, push it to denx, and
generate a pull request for Albert if you want.
Tom
On Sat, Dec 15, 2012 at 9:41 AM, Albert ARIBAUD
wrote:
> Hi Allen,
>
> On Tue, 11 Dec 2012 11:02:09 -08
Hi Allen,
On Tue, 11 Dec 2012 11:02:09 -0800, Allen Martin
wrote:
> On Mon, Dec 10, 2012 at 01:51:40PM -0800, Tom Warren wrote:
> > Albert,
> >
> > > On Sat, Dec 8, 2012 at 11:03 PM, Albert ARIBAUD
> > > wrote:
> > >> Hello,
> > >>
> > >> It seems like two commits 5ddcc38b (in u-boot, committed
Albert,
On Thu, Dec 13, 2012 at 12:20 PM, Albert ARIBAUD
wrote:
> Hi Tom,
>
> On Mon, 10 Dec 2012 14:15:10 -0700, Tom Warren
> 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
Hi Tom,
On Mon, 10 Dec 2012 14:15:10 -0700, Tom Warren
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_
On Mon, Dec 10, 2012 at 01:51:40PM -0800, Tom Warren wrote:
> Albert,
>
> > On Sat, Dec 8, 2012 at 11:03 PM, Albert ARIBAUD
> > 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
> >
Albert,
> On Sat, Dec 8, 2012 at 11:03 PM, Albert ARIBAUD
> 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
>> possib
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
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 wrote:
> > Will do.
> >
> > On Sat, Dec 8, 2012 at 11:03 PM, Albert ARIBAUD
> > wrote:
> >> Hello,
> >>
> >> It seems like two commits 5ddcc38b (in u-boot, committed by Marek)
>
Albert,
On Mon, Dec 10, 2012 at 9:25 AM, Tom Warren wrote:
> Will do.
>
> On Sat, Dec 8, 2012 at 11:03 PM, Albert ARIBAUD
> 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
Will do.
On Sat, Dec 8, 2012 at 11:03 PM, Albert ARIBAUD
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
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).
Tom, can you look into it (and involve whoever is needed) and provid
22 matches
Mail list logo
