From: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
To: greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org
Subject: Re: [PATCHv8] net: Add batman-adv meshing protocol
Date: Thu, 16 Dec 2010 14:27:25 -0800 (PST) [thread overview]
Message-ID: <20101216.142725.212679030.davem@davemloft.net> (raw)
In-Reply-To: <20101216222111.GA13395-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
From: Greg KH <greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
Date: Thu, 16 Dec 2010 14:21:11 -0800
> On Thu, Dec 16, 2010 at 02:01:53PM -0800, David Miller wrote:
>> From: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
>> Date: Mon, 13 Dec 2010 22:19:28 +0100
>>
>> > B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a routing
>> > protocol for multi-hop ad-hoc mesh networks. The networks may be wired or
>> > wireless. See http://www.open-mesh.org/ for more information and user space
>> > tools.
>> >
>> > Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
>>
>> Applied, thanks Sven.
>>
>> How do you want to take care of the copy that still lives under
>> staging?
>>
>> Greg, any preferences on your end?
>>
>> I'm more than happy to do the removal from my net-next-2.6 tree
>> since the bonafide copy of net/batman-adv is now there.
>
> That might conflict with the patches that I have added to my tree for
> merging in the .38 timeframe for the batman code. How about I just drop
> the whole drivers/staging/batman/ directory in my tree and then we don't
> have any merge issues?
Perfect.
next prev parent reply other threads:[~2010-12-16 22:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-13 21:19 [PATCHv8] net: Add batman-adv meshing protocol Sven Eckelmann
2010-12-16 22:01 ` David Miller
[not found] ` <20101216.140153.232733922.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2010-12-16 22:21 ` Sven Eckelmann
[not found] ` <201012162321.11580.sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
2010-12-16 22:52 ` David Miller
2010-12-16 22:21 ` Greg KH
[not found] ` <20101216222111.GA13395-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2010-12-16 22:27 ` David Miller [this message]
2010-12-16 22:28 ` [PATCH] Staging: batman-adv: Remove batman-adv from staging Sven Eckelmann
2010-12-16 22:31 ` David Miller
[not found] ` <1292538497-13604-1-git-send-email-sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
2010-12-16 23:23 ` Greg KH
[not found] ` <20101216232301.GA19390-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2010-12-16 23:39 ` 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=20101216.142725.212679030.davem@davemloft.net \
--to=davem-ft/pcqaiutieiz0/mpfg9q@public.gmane.org \
--cc=b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org \
--cc=greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.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).