2010-08-03 01:48:58

by Stephen Rothwell

Subject: linux-next: manual merge of the davinci tree with Linus' tree

Hi Kevin,

Today's linux-next merge of the davinci tree got a conflict in
arch/arm/mach-davinci/board-da850-evm.c between commit
8b24599e72c9aee1ea1187e29cb9c5de9f449cce ("davinci: da850/omap-l138 evm:
account for DEFDCDC{2,3} being tied high") from Linus' tree and commit
ebd1e7808b2fe72d627bdab7bcf61126a831ca5a ("davinci: da850 evm: sparse
cleanup: make file local variables static") from the davinci tree.

Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell [email protected]

diff --cc arch/arm/mach-davinci/board-da850-evm.c
index b280efb,f6942dd..0000000
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@@ -470,12 -469,7 +470,12 @@@ static struct regulator_consumer_suppl
},
};

+/* We take advantage of the fact that both defdcdc{2,3} are tied high */
+static struct tps6507x_reg_platform_data tps6507x_platform_data = {
+ .defdcdc_default = true,
+};
+
- struct regulator_init_data tps65070_regulator_data[] = {
+ static struct regulator_init_data tps65070_regulator_data[] = {
/* dcdc1 */
{
.constraints = {

2010-08-04 16:10:12

by Sekhar Nori

Subject: RE: linux-next: manual merge of the davinci tree with Linus' tree

Hi Stephen,

On Tue, Aug 03, 2010 at 07:18:53, Stephen Rothwell wrote:
> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflict in
> arch/arm/mach-davinci/board-da850-evm.c between commit
> 8b24599e72c9aee1ea1187e29cb9c5de9f449cce ("davinci: da850/omap-l138 evm:
> account for DEFDCDC{2,3} being tied high") from Linus' tree and commit
> ebd1e7808b2fe72d627bdab7bcf61126a831ca5a ("davinci: da850 evm: sparse
> cleanup: make file local variables static") from the davinci tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix
> for a while.

Thanks for fixing this.

Kevin is on a vacation. There would be a delayed response.

Regards,
Sekhar

2010-08-05 16:30:25

by Kevin Hilman

Subject: Re: linux-next: manual merge of the davinci tree with Linus' tree

On Mon, Aug 2, 2010 at 6:48 PM, Stephen Rothwell <[email protected]> wrote:
> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflict in
> arch/arm/mach-davinci/board-da850-evm.c between commit
> 8b24599e72c9aee1ea1187e29cb9c5de9f449cce ("davinci: da850/omap-l138 evm:
> account for DEFDCDC{2,3} being tied high") from Linus' tree and commit
> ebd1e7808b2fe72d627bdab7bcf61126a831ca5a ("davinci: da850 evm: sparse
> cleanup: make file local variables static") from the davinci tree.
>
> Just context changes. ?I fixed it up (see below) and can carry the fix
> for a while.

Thanks for catching this.

Before I submit to Linus, I'll merge this with the original tree
(Liam's voltage-2.6 tree) so Linus doesn't have to fix this up.

Kevin

> diff --cc arch/arm/mach-davinci/board-da850-evm.c
> index b280efb,f6942dd..0000000
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@@ -470,12 -469,7 +470,12 @@@ static struct regulator_consumer_suppl
> ? ? ? ?},
> ?};
>
> ?+/* We take advantage of the fact that both defdcdc{2,3} are tied high */
> ?+static struct tps6507x_reg_platform_data tps6507x_platform_data = {
> ?+ ? ? ?.defdcdc_default = true,
> ?+};
> ?+
> - struct regulator_init_data tps65070_regulator_data[] = {
> + static struct regulator_init_data tps65070_regulator_data[] = {
> ? ? ? ?/* dcdc1 */
> ? ? ? ?{
> ? ? ? ? ? ? ? ?.constraints = {
>

2010-08-05 16:34:32

by Kevin Hilman

Subject: Re: linux-next: manual merge of the davinci tree with Linus' tree

On Thu, Aug 5, 2010 at 9:30 AM, Kevin Hilman
<[email protected]> wrote:
> On Mon, Aug 2, 2010 at 6:48 PM, Stephen Rothwell <[email protected]> wrote:
>> Hi Kevin,
>>
>> Today's linux-next merge of the davinci tree got a conflict in
>> arch/arm/mach-davinci/board-da850-evm.c between commit
>> 8b24599e72c9aee1ea1187e29cb9c5de9f449cce ("davinci: da850/omap-l138 evm:
>> account for DEFDCDC{2,3} being tied high") from Linus' tree and commit
>> ebd1e7808b2fe72d627bdab7bcf61126a831ca5a ("davinci: da850 evm: sparse
>> cleanup: make file local variables static") from the davinci tree.
>>
>> Just context changes. ?I fixed it up (see below) and can carry the fix
>> for a while.
>
> Thanks for catching this.
>
> Before I submit to Linus, I'll merge this with the original tree
> (Liam's voltage-2.6 tree) so Linus doesn't have to fix this up.
>

On second thought, to keep it simple, I'm just going to drop the
version from the davinci tree for this merge window, update it and
submit it as a fix in -rc2.

Kevin