From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] python-cython: bump to version 0.29.5
Date: Mon, 18 Feb 2019 22:50:15 +0100 [thread overview]
Message-ID: <20190218225015.7a10cb2b@windsurf.home> (raw)
In-Reply-To: <20190218212953.21179-1-joseph.kogut@gmail.com>
On Mon, 18 Feb 2019 13:29:53 -0800
Joseph Kogut <joseph.kogut@gmail.com> wrote:
> Updated license file checksums after a minor change to URLs.
>
> Signed-off-by: Joseph Kogut <joseph.kogut@gmail.com>
> ---
This patch doesn't apply to the next branch:
buildroot (next)$ git pwam 1044341
Applying patch #1044341 using "git am -s"
Description: [1/1] python-cython: bump to version 0.29.5
Applying: python-cython: bump to version 0.29.5
error: patch failed: package/python-cython/python-cython.hash:1
error: package/python-cython/python-cython.hash: patch does not apply
error: patch failed: package/python-cython/python-cython.mk:4
error: package/python-cython/python-cython.mk: patch does not apply
Patch failed at 0001 python-cython: bump to version 0.29.5
hint: Use 'git am --show-current-patch' to see the failed 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".
'git am' failed with exit status 128
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2019-02-18 21:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-18 21:29 [Buildroot] [PATCH 1/1] python-cython: bump to version 0.29.5 Joseph Kogut
2019-02-18 21:31 ` Joseph Kogut
2019-02-18 21:50 ` Thomas Petazzoni [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-02-09 15:05 Asaf Kahlon
2019-02-10 10:34 ` Thomas Petazzoni
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=20190218225015.7a10cb2b@windsurf.home \
--to=thomas.petazzoni@bootlin.com \
--cc=buildroot@busybox.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox