On 11/19/2015 11:04 AM, Felipe Balbi wrote: > > Hi, > > Zhangfei Gao <zhangfei.gao@xxxxxxxxxx> writes: >> Support hisilicon,hi6220-usb for HiKey board >> >> Signed-off-by: Zhangfei Gao <zhangfei.gao@xxxxxxxxxx> > > doesn't apply: > > Applying: usb: dwc2: add support of hi6220 > error: drivers/usb/dwc2/platform.c: does not match index > Patch failed at 0001 usb: dwc2: add support of hi6220 > The copy of the patch that failed is found in: workspace/linux/.git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > Care to rebase on my testing/next and also collect John's and Rob's ack ? > That's weird. I just sync'd to your testing/next and it seems to apply fine. Same with the series from Gregory Herrero. Any chance it's something to do with your local repo? Regards, John -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
