All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: failed import of the usb quilt series
Date: Mon, 26 Jul 2010 21:17:40 -0700	[thread overview]
Message-ID: <20100727041740.GD16038@kroah.com> (raw)
In-Reply-To: <20100727104236.eeccabdf.sfr@canb.auug.org.au>

On Tue, Jul 27, 2010 at 10:42:36AM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Importing the usb quilt series today produced this error:
> 
> usb-serial-enabling-support-for-segway-rmp-in-ftdi_sio.patch
> error: patch failed: drivers/usb/serial/ftdi_sio.c:746
> error: drivers/usb/serial/ftdi_sio.c: patch does not apply
> Context reduced to (1/0) to apply fragment at 1012
> 
> I removed that patch for today.

Thanks, yes, this is a known issue, it conflicts with a patch that I
sent to Linus that is already in his tree.  I'll resync tomorrow with
the latest -git snapshot and it should work.

thanks,

greg k-h

      reply	other threads:[~2010-07-27  4:17 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-27  0:42 linux-next: failed import of the usb quilt series Stephen Rothwell
2010-07-27  4:17 ` Greg KH [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100727041740.GD16038@kroah.com \
    --to=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.