Hi Denis,

On 01/04/2011 03:06 PM, ext Denis Kenzior wrote:
> Hi Lei,
>
> On 01/04/2011 05:00 PM, Lei Yu wrote:
>> ---
>>   Makefile.am        |    3 +-
>>   include/cdma-sms.h |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>>   2 files changed, 69 insertions(+), 1 deletions(-)
>>   create mode 100644 include/cdma-sms.h
>>
>
> Still doesn't apply:
> denkenz(a)ubuntu:~/ofono-master$ git am --3way ~/merge/\[PATCH\ v2\,\
> 2_7\]\ cdma-sms\:\ Add\ CDMA\ SMS\ Support.eml
> Applying: cdma-sms: Add CDMA SMS Support
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> Auto-merging Makefile.am
> CONFLICT (content): Merge conflict in Makefile.am
> Failed to merge in the changes.
> Patch failed at 0001 cdma-sms: Add CDMA SMS Support
> When you have resolved this problem run "git am -3 --resolved".
> If you would prefer to skip this patch, instead run "git am -3 --skip".
> To restore the original branch and stop patching run "git am -3 --abort".
>
> Have you rebased to the latest git?
>
> Regards,
> -Denis

Looks like you are still applying v2 of the patch instead of v3 of the 
patch. v3 is the one I did the rebase and I have applied the patch 
locally and did not see any problem. Could you pls apply v3 instead?

Regards,
-Lei