13 Jun
2016
13 Jun
'16
8:06 a.m.
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.
___________________________________________________________________