On Tue, Dec 23, 2014 at 12:47:42PM -0600, Felipe Balbi wrote: > On Mon, Dec 01, 2014 at 09:47:06PM +0200, Laurent Pinchart wrote: > > Both handle platform devices, merge them. > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > > doesn't apply: > > checking file drivers/usb/host/isp1760-if.c > Hunk #1 FAILED at 12. > Hunk #2 succeeded at 304 (offset -1 lines). > Hunk #3 succeeded at 332 (offset -1 lines). > Hunk #4 succeeded at 404 (offset -1 lines). > Hunk #5 succeeded at 431 (offset -1 lines). > Hunk #6 succeeded at 446 (offset -1 lines). > 1 out of 6 hunks FAILED > > please rebase on my testig/next, just wait some 15 minutes before > rebasing :-) oh, and after you rebase, can you add a patch moving this outside of the host directory too ? Now that this is DRD, it doesn't make sense to keep it under drivers/usb/host. -- balbi
Attachment:
signature.asc
Description: Digital signature
