From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <greg@kroah.com>
Date: Thu, 16 Dec 2010 14:21:11 -0800
From: Greg KH <greg@kroah.com>
Message-ID: <20101216222111.GA13395@kroah.com>
References: <1292275168-19882-1-git-send-email-sven@narfation.org>
	<20101216.140153.232733922.davem@davemloft.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20101216.140153.232733922.davem@davemloft.net>
Subject: Re: [B.A.T.M.A.N.] [PATCHv8] net: Add batman-adv meshing protocol
Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking
	<b.a.t.m.a.n@lists.open-mesh.org>
List-Id: The list for a Better Approach To Mobile Ad-hoc Networking
	<b.a.t.m.a.n.lists.open-mesh.org>
List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>,
	<mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe>
List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n>
List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org>
List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help>
List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>,
	<mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org

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