From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752657Ab0EFGVv (ORCPT ); Thu, 6 May 2010 02:21:51 -0400 Received: from kroah.org ([198.145.64.141]:56962 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751082Ab0EFGVu (ORCPT ); Thu, 6 May 2010 02:21:50 -0400 Date: Wed, 5 May 2010 23:21:29 -0700 From: Greg KH To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Prashant P. Shah" , Jiri Pirko , David Miller , netdev@vger.kernel.org Subject: Re: linux-next: manual merge of the staging-next tree with the net tree Message-ID: <20100506062129.GA23076@kroah.com> References: <20100506140543.d6f3841f.sfr@canb.auug.org.au> <20100506042048.GA25425@kroah.com> <20100506142139.c1b1c1c3.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100506142139.c1b1c1c3.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 06, 2010 at 02:21:39PM +1000, Stephen Rothwell wrote: > Hi Greg, > > On Wed, 5 May 2010 21:20:48 -0700 Greg KH wrote: > > > > Thanks for doing this. Hm, the arlan driver is scheduled to be deleted > > in .35, so it would make things easier if I just do it now to keep these > > kinds of merge issues from happening. I'll queue that up tomorrow. > > Ah, yes, that would be easier. Thanks. It is now deleted, along with 3 other drivers that were scheduled to be deleted in .35, so you will not have any merge issues with them anymore. thanks, greg k-h