From: Denis Kenzior <denkenz@gmail.com>
To: ofono@ofono.org
Subject: Re: [PATCH] Enabling PDP Context support in atmodem.
Date: Fri, 18 Jun 2010 12:57:58 -0500 [thread overview]
Message-ID: <201006181257.58444.denkenz@gmail.com> (raw)
In-Reply-To: <AANLkTinDk9-gwLP0pC_8Wqud8MXotrAkVxYHBPP7rmys@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]
Hi Arun,
> From d30d8658767de97b0ffb45697616604fb1576741 Mon Sep 17 00:00:00 2001
> From: arun <arunlee@gmail.com>
> Date: Thu, 17 Jun 2010 21:42:00 +0300
> Subject: [PATCH] Enabling PDP Context support in atmodem.
>
> ---
> plugins/atgen.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
>
Your patch looks good, however it seems there's some extra junk appended at
the end of the patch. Git is getting confused and cannot apply it. Please
rebase and resubmit:
denkenz(a)localhost ~/ofono-master $ git am ~/merge/\[PATCH\]\ Enabling\ PDP\
Context\ support\ in\ atmodem..mbox
Applying: Enabling PDP Context support in atmodem.
fatal: patch fragment without header at line 46: @@ -50,6 +50,8
@@<br>�#include <ofono/voicecall.h><br>�<br>�#include
<drivers/atmodem/sim-poll.h><br>+#include
<ofono/gprs.h><br>+#include <ofono/gprs-context.h><br>�<br>�static
const char *tty_opts[] = {<br>
Patch failed at 0001 Enabling PDP Context support in atmodem.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Thanks,
-Denis
next prev parent reply other threads:[~2010-06-18 17:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-17 20:17 [PATCH] Enabling PDP Context support in atmodem Arun Ravindran
2010-06-18 17:57 ` Denis Kenzior [this message]
2010-06-19 14:53 ` Arun Ravindran
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201006181257.58444.denkenz@gmail.com \
--to=denkenz@gmail.com \
--cc=ofono@ofono.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.