From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: Re: [B.A.T.M.A.N.] [PATCH 1/4] batman-adv: Prevent mutliple ARP replies sent by gateways in bla setups with dat enabled
Date: Fri, 12 Feb 2016 15:47:08 +0100 [thread overview]
Message-ID: <4371963.A8XJeSUaCP@sven-edge> (raw)
In-Reply-To: <OF514CE6A6.70ACFF1A-ONC1257F57.004BE44C-C1257F57.004C213B@phoenixcontact.com>
[-- Attachment #1: Type: text/plain, Size: 1022 bytes --]
On Friday 12 February 2016 14:51:32 Andreas Pape wrote:
> From 2b90abdf53e9ab09d9acfd141c7225de1ae16719 Mon Sep 17 00:00:00 2001
> From: Andreas Pape <apape@phoenixcontact.com>
> Date: Fri, 12 Feb 2016 10:05:57 +0100
> Subject: [PATCH 1/4] batman-adv: Prevent mutliple ARP replies sent by
> gateways in bla setups with dat enabled
>
This patch is corrupt:
Applying: batman-adv: Prevent mutliple ARP replies sent by gateways in bla setups with dat enabled
fatal: corrupt patch at line 32
Patch failed at 0001 batman-adv: Prevent mutliple ARP replies sent by gateways in bla setups with dat enabled
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".
Please read https://www.kernel.org/doc/Documentation/email-clients.txt
and https://www.kernel.org/doc/Documentation/SubmittingPatches
Kind regards,
Sven
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-02-12 14:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-12 13:51 [B.A.T.M.A.N.] [PATCH 1/4] batman-adv: Prevent mutliple ARP replies sent by gateways in bla setups with dat enabled Andreas Pape
2016-02-12 14:47 ` Sven Eckelmann [this message]
[not found] ` <OFD4FAC06D.50E7ADCE-ONC1257F57.005D7B39-C1257F57.005FA7D8@phoenixcontact.com>
2016-02-12 17:36 ` [B.A.T.M.A.N.] Antwort: " Sven Eckelmann
2016-02-15 8:50 ` [B.A.T.M.A.N.] " Simon Wunderlich
2016-02-15 9:11 ` Sven Eckelmann
2016-02-15 9:39 ` [B.A.T.M.A.N.] Antwort: " Andreas Pape
2016-02-15 10:08 ` Sven Eckelmann
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=4371963.A8XJeSUaCP@sven-edge \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox