From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-oe][PATCH] php: update to 5.5.21 to fix some bugs.
Date: Wed, 4 Feb 2015 17:10:24 +0100 [thread overview]
Message-ID: <20150204161024.GA2437@jama> (raw)
In-Reply-To: <3881161.YmyCNY23yg@peggleto-mobl5.ger.corp.intel.com>
[-- Attachment #1: Type: text/plain, Size: 1560 bytes --]
On Tue, Feb 03, 2015 at 12:10:02PM +0000, Paul Eggleton wrote:
> Hi Bian,
>
> On Tuesday 03 February 2015 13:20:16 Bian Naimeng wrote:
> > Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
>
> Could you please re-send this with -M as it's very difficult to see what you
> have changed with the default formatting.
And rebase before re-send, because this version doesn't apply in current
master:
OE @ ~/meta-openembedded $ pwam 87897
2015-02-04 17:08:48 URL:http://patchwork.openembedded.org/patch/87897/mbox/ [22043] -> "pw-am-87897.patch" [1]
Applying: php: update to 5.5.21 to fix some bugs.
error: patch failed: meta-oe/recipes-devtools/php/php_5.5.20.bb:1
error: meta-oe/recipes-devtools/php/php_5.5.20.bb: patch does not apply
/OE/meta-openembedded/.git/rebase-apply/patch:491: new blank line at EOF.
+
Patch failed at 0001 php: update to 5.5.21 to fix some bugs.
The copy of the patch that failed is found in:
/OE/meta-openembedded/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
>
> Thanks,
> Paul
>
> --
>
> Paul Eggleton
> Intel Open Source Technology Centre
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
prev parent reply other threads:[~2015-02-04 16:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-03 5:20 [meta-oe][PATCH] php: update to 5.5.21 to fix some bugs Bian Naimeng
2015-02-03 12:10 ` Paul Eggleton
2015-02-04 16:10 ` Martin Jansa [this message]
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=20150204161024.GA2437@jama \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.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.