From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754086Ab0BRAWo (ORCPT ); Wed, 17 Feb 2010 19:22:44 -0500 Received: from kroah.org ([198.145.64.141]:45478 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750851Ab0BRAWm (ORCPT ); Wed, 17 Feb 2010 19:22:42 -0500 Date: Wed, 17 Feb 2010 16:21:44 -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: <20100218002144.GA17850@kroah.com> References: <20100218105500.898ece5e.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100218105500.898ece5e.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 Thu, Feb 18, 2010 at 10:55:00AM +1100, Stephen Rothwell wrote: > Hi Greg, > > Importing the usb quilt series failed like this: > > usb-ftdi_sio-correct-spelling-in-header-files.patch > error: patch failed: drivers/usb/serial/ftdi_sio_ids.h:185 > error: drivers/usb/serial/ftdi_sio_ids.h: patch does not apply > > I removed that patch for today. Very wierd, you must have gotten this just as I updated my tree. It should all be fine tomorrow, if not, please let me know. thanks, greg k-h