From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCHv2] wine: Bump to version 1.8.1
Date: Mon, 8 Feb 2016 16:33:05 +0100 [thread overview]
Message-ID: <20160208163305.1f97fe82@free-electrons.com> (raw)
In-Reply-To: <56B8A8B7.7090502@dawncrow.de>
Andr?,
On Mon, 8 Feb 2016 15:39:51 +0100, Andr? Hentschel wrote:
> Bumping to stable version 1.8.1
>
> Upstreamed patch is finally dropped.
>
> Signed-off-by: Andr? Hentschel <nerv@dawncrow.de>
Thanks, but could you please resend your patch with "git send-email" ?
It doesn't apply here:
thomas at skate:~/projets/buildroot (master)$ git pwam 580310
Applying patch #580310 using 'git am -s -3'
Description: [PATCHv2] wine: Bump to version 1.8.1
Applying: wine: Bump to version 1.8.1
fatal: corrupt patch at line 131
error: could not build fake ancestor
Patch failed at 0001 wine: Bump to version 1.8.1
The copy of the patch that failed is found in: .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".
You can reproduce yourself by doing:
$ curl -s http://patchwork.ozlabs.org/patch/580310/mbox/ | git am
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
prev parent reply other threads:[~2016-02-08 15:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-08 14:39 [Buildroot] [PATCHv2] wine: Bump to version 1.8.1 André Hentschel
2016-02-08 15:33 ` Thomas Petazzoni [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=20160208163305.1f97fe82@free-electrons.com \
--to=thomas.petazzoni@free-electrons.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