From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758291AbZFCP2Q (ORCPT ); Wed, 3 Jun 2009 11:28:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754825AbZFCP1Q (ORCPT ); Wed, 3 Jun 2009 11:27:16 -0400 Received: from kroah.org ([198.145.64.141]:39113 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754900AbZFCP1M (ORCPT ); Wed, 3 Jun 2009 11:27:12 -0400 Date: Wed, 3 Jun 2009 08:00:17 -0700 From: Greg KH To: Stephen Rothwell Cc: Alan Cox , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Craig Shelley Subject: Re: linux-next: manual merge of the usb tree with the ttydev tree Message-ID: <20090603150017.GD30890@kroah.com> References: <20090603180734.f175e04f.sfr@canb.auug.org.au> <20090603095547.1641ca7b@lxorguk.ukuu.org.uk> <20090603204655.3f431574.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090603204655.3f431574.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 03, 2009 at 08:46:55PM +1000, Stephen Rothwell wrote: > Hi Alan, > > On Wed, 3 Jun 2009 09:55:47 +0100 Alan Cox wrote: > > > > > As a side issue, the last patch has no SOB from Craig in the ttydev tree. > > > > Yes it does... > > > > Signed-off-by: Craig Shelley > > > > (Fixed some collisions merging) > > > > Signed-off-by: Alan Cox > > Sorry, going blind in my old age :-) > > > > So, I just used the ttydev tree version on the assumption that my > > > reasoning above is correct. > > > > and the ttydev tree one is the one to use > > Thanks for the confirmation. Ok, I'll drop these three patches from my tree. thanks, greg k-h