From: Marek Lindner <lindner_marek@yahoo.de>
To: The list for a Better Approach To Mobile Ad-hoc Networking
<b.a.t.m.a.n@lists.open-mesh.org>
Subject: Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Revert Distributed ARP Table
Date: Sat, 19 May 2012 15:45:28 +0800 [thread overview]
Message-ID: <201205191545.28651.lindner_marek@yahoo.de> (raw)
In-Reply-To: <2747952.xVrmVMOGXq@sven-laptop.home.narfation.org>
On Saturday, May 19, 2012 14:53:16 Sven Eckelmann wrote:
> > merge.patch -- this is the patch that can be used to create the merge of
> > next into merge after all remaining namespace patches are applied and
> > "batman- adv: Revert Distributed ARP Table" *is applied in next after
> > ccf1183f53baa879cd5a808dbb904f6053fa40f3*.
> >
> >
> >
> > $ git merge --no-commit -s ours next
> > $ git apply --index merge.patch
> > $ git commit
>
> I've attached the updated patch that is compatible with your changes in
> distributed-arp-table.c to my patches.
Applied in revision 206af11.
Thanks,
Marek
next prev parent reply other threads:[~2012-05-19 7:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-17 15:18 [B.A.T.M.A.N.] [PATCH] batman-adv: Revert Distributed ARP Table Sven Eckelmann
2012-05-17 16:23 ` Sven Eckelmann
2012-05-17 19:05 ` Antonio Quartulli
2012-05-19 6:53 ` Sven Eckelmann
2012-05-19 7:45 ` Marek Lindner [this message]
2012-05-19 6:11 ` Marek Lindner
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=201205191545.28651.lindner_marek@yahoo.de \
--to=lindner_marek@yahoo.de \
--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;
as well as URLs for NNTP newsgroup(s).