* linux-next: failed import of the usb quilt series
@ 2010-07-27 0:42 Stephen Rothwell
2010-07-27 4:17 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-07-27 0:42 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: failed import of the usb quilt series
2010-07-27 0:42 linux-next: failed import of the usb quilt series Stephen Rothwell
@ 2010-07-27 4:17 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2010-07-27 4:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-27 4:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-27 0:42 linux-next: failed import of the usb quilt series Stephen Rothwell
2010-07-27 4:17 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox