2010-01-29 00:13:56

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the davinci tree with the arm tree

Hi Kevin,

Today's linux-next merge of the davinci tree got a conflict in
arch/arm/mach-bcmring/core.c between commit
dd84ce18c8f522d26aef6e9e9c05c32485b667a7 ("ARM: Consolidate
clks_register() and similar") from the arm tree and commit
25c692215f5dfc4992b11c4fb57538d1139d6636 ("Consolidate clks_register()
and similar") from the davinci tree.

The davinci tree version has a typo (ARRAY_SIEZ v. ARRAY_SIZE) so I used
the arm tree version.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

Attachments:
(No filename) (544.00 B)
 (No filename) (198.00 B)
 Download all attachments

2010-01-29 23:33:35

by Kevin Hilman

[permalink] [raw]
Subject: Re: linux-next: manual merge of the davinci tree with the arm tree

Stephen Rothwell <[email protected]> writes:

> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflict in
> arch/arm/mach-bcmring/core.c between commit
> dd84ce18c8f522d26aef6e9e9c05c32485b667a7 ("ARM: Consolidate
> clks_register() and similar") from the arm tree and commit
> 25c692215f5dfc4992b11c4fb57538d1139d6636 ("Consolidate clks_register()
> and similar") from the davinci tree.
>
> The davinci tree version has a typo (ARRAY_SIEZ v. ARRAY_SIZE) so I used
> the arm tree version.

OK, I'll drop the one from the davinci tree.

Thanks,

Kevin


2010-01-30 01:26:35

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: manual merge of the davinci tree with the arm tree

Hi Kevin,

On Fri, 29 Jan 2010 15:33:29 -0800 Kevin Hilman <[email protected]> wrote:
>
> OK, I'll drop the one from the davinci tree.

OK, thanks.

--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

Attachments:
(No filename) (262.00 B)
 (No filename) (198.00 B)
 Download all attachments