From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754339Ab0BSPxu (ORCPT ); Fri, 19 Feb 2010 10:53:50 -0500 Received: from kroah.org ([198.145.64.141]:48586 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752881Ab0BSPxs (ORCPT ); Fri, 19 Feb 2010 10:53:48 -0500 Date: Fri, 19 Feb 2010 07:53:43 -0800 From: Greg KH To: Stephen Rothwell Cc: linux-next@vger.kernel.org, LKML Subject: Re: linux-next: import of usb series failed Message-ID: <20100219155343.GA3946@kroah.com> References: <20100218105500.898ece5e.sfr@canb.auug.org.au> <20100218002144.GA17850@kroah.com> <20100218132221.b15d151f.sfr@canb.auug.org.au> <20100219175218.10025a7a.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100219175218.10025a7a.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 19, 2010 at 05:52:18PM +1100, Stephen Rothwell wrote: > Hi Greg, > > On Thu, 18 Feb 2010 13:22:21 +1100 Stephen Rothwell wrote: > > > > On Wed, 17 Feb 2010 16:21:44 -0800 Greg KH wrote: > > > > > > Very wierd, you must have gotten this just as I updated my tree. It > > > > Yeah, that is possible. > > > > > should all be fine tomorrow, if not, please let me know. > > > > Great, thanks. > > I got the same today. Is this a case of Git being a bit more picky about > applying patches that quilt? Very wierd. I just ran 'git quiltimport' on my whole tree onto Linus's latest git tree and it worked just fine. What is the command you are using here to do this? Perhaps there is some other tree modifying this file causing a problem? odd, greg k-h