netdev - Re: [PATCHv8] net: Add batman-adv meshing protocol

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20101216222111.GA13395@kroah.com>
Date:	Thu, 16 Dec 2010 14:21:11 -0800
From:	Greg KH <greg@...ah.com>
To:	David Miller <davem@...emloft.net>
Cc:	sven@...fation.org, netdev@...r.kernel.org,
	b.a.t.m.a.n@...ts.open-mesh.org
Subject: Re: [PATCHv8] net: Add batman-adv meshing protocol

On Thu, Dec 16, 2010 at 02:01:53PM -0800, David Miller wrote:
> From: Sven Eckelmann <sven@...fation.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@...fation.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?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html