linux-next: failed import of the usb quilt series
in [Kernel]
|
Prev: [PATCH 2.6.{32, 33, 34}.stable] ACPI: skip checking BM_STS if the BIOS doesn't ask for it
Next: [PATCH] GSoC 2010 - Memory hotplug support for Xen guests - fully working version
From: Stephen Rothwell on 26 Jul 2010 20:50 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(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Greg KH on 27 Jul 2010 00:30
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |