On Thu, Aug 5, 2010 at 9:30 AM, Kevin Hilman
<khilman@xxxxxxxxxxxxxxxxxxx> wrote:
> On Mon, Aug 2, 2010 at 6:48 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
