From: Andreas Pape <APape@phoenixcontact.com>
To: Sven Eckelmann <sven@narfation.org>
Cc: b.a.t.m.a.n@lists.open-mesh.org
Subject: Re: [B.A.T.M.A.N.] [PATCH v5 0/6] Optimizations for setups running dat and bla
Date: Mon, 13 Jun 2016 10:06:55 +0200 [thread overview]
Message-ID: <OF0242108B.FF91E42D-ONC1257FD1.00289079-C1257FD1.002C94B2@phoenixcontact.com> (raw)
In-Reply-To: <7048408.piSH5dZvnO@bentobox>
Hi Sven,
thanks for the feedback. I just realized that I forgot to rebase the
patchset before sending it. Could this be the cause?
When I try to apply the patches locally to a fresh cloned batman-adv
repository, the patches succeeded but some hunks succeed with some
offset or fuzz only due to the missing rebase.
> Doesn't seem to apply:
>
> $ git describe
> v2016.2-50-g3ce003c
> $ git am ~/bundle-11-datbla.mbox
> Applying: batman-adv: prevent multiple ARP replies sent by
> gateways if dat enbled
> error: patch failed: net/batman-adv/distributed-arp-table.c:43
> error: net/batman-adv/distributed-arp-table.c: patch does not apply
> Patch failed at 0001 batman-adv: prevent multiple ARP replies
> sent by gateways if dat enbled
> 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".
>
> Btw. there seems to be an "a" missing in "enabled" of the Subject
> of the first patch :)
>
Will be corrected as there's another version obviously necessary ...;-)
Best regards,
Andreas
..................................................................
PHOENIX CONTACT ELECTRONICS GmbH
Sitz der Gesellschaft / registered office of the company: 31812 Bad Pyrmont
USt-Id-Nr.: DE811742156
Amtsgericht Hannover HRB 100528 / district court Hannover HRB 100528
Geschäftsführer / Executive Board: Roland Bent, Dr. Martin Heubeck
___________________________________________________________________
Diese E-Mail enthält vertrauliche und/oder rechtlich geschützte Informationen. Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtümlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten Sie diese Mail. Das unerlaubte Kopieren, jegliche anderweitige Verwendung sowie die unbefugte Weitergabe dieser Mail ist nicht gestattet.
----------------------------------------------------------------------------------------------------
This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure, distribution or other use of the material or parts thereof is strictly forbidden.
___________________________________________________________________
next prev parent reply other threads:[~2016-06-13 8:06 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-10 11:10 [B.A.T.M.A.N.] [PATCH v5 0/6] Optimizations for setups running dat and bla Andreas Pape
2016-06-10 11:10 ` [B.A.T.M.A.N.] [PATCH v5 1/6] batman-adv: prevent multiple ARP replies sent by gateways if dat enbled Andreas Pape
2016-07-01 13:52 ` Simon Wunderlich
2016-06-10 11:11 ` [B.A.T.M.A.N.] [PATCH v5 2/6] batman-adv: speed up dat by snooping received ip traffic Andreas Pape
2016-06-25 10:04 ` Sven Eckelmann
2016-06-26 8:54 ` Ruben Wisniewski
2016-06-26 9:29 ` Sven Eckelmann
2016-07-01 13:49 ` Simon Wunderlich
2016-07-19 6:29 ` Linus Lüssing
2016-07-19 6:59 ` Sven Eckelmann
2016-07-19 7:06 ` Ruben Wisniewski
2016-07-19 16:15 ` Linus Lüssing
2016-07-19 16:13 ` Linus Lüssing
2016-06-10 11:11 ` [B.A.T.M.A.N.] [PATCH v5 3/6] batman-adv: prevent duplication of ARP replies when DAT is used Andreas Pape
2016-07-01 14:11 ` Simon Wunderlich
2016-06-10 11:11 ` [B.A.T.M.A.N.] [PATCH v5 4/6] batman-adv: drop unicast packets from other backbone gw Andreas Pape
2016-07-01 13:48 ` Simon Wunderlich
2016-06-10 11:11 ` [B.A.T.M.A.N.] [PATCH v5 5/6] batman-adv: changed debug messages for easier bla debugging Andreas Pape
2016-06-10 11:11 ` [B.A.T.M.A.N.] [PATCH v5 6/6] batman-adv: handle race condition for claims between gateways Andreas Pape
2016-06-10 11:51 ` [B.A.T.M.A.N.] [PATCH v5 0/6] Optimizations for setups running dat and bla Sven Eckelmann
2016-06-13 8:06 ` Andreas Pape [this message]
2016-06-13 9:01 ` Sven Eckelmann
2016-07-01 14:12 ` Simon Wunderlich
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=OF0242108B.FF91E42D-ONC1257FD1.00289079-C1257FD1.002C94B2@phoenixcontact.com \
--to=apape@phoenixcontact.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=sven@narfation.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.