HI, On Fri, Jun 15, 2012 at 09:25:19AM -0300, Fabio Estevam wrote: > On Fri, Jun 15, 2012 at 8:36 AM, Felipe Balbi <balbi@xxxxxx> wrote: > > > does not apply, please refresh on top of my gadget branch. (give me an > > hour though as I will push some more patches there very soon). > > Please try again. I saw another patch of mine just got applied, which > should fix the conflict. didn't work: $ patch -p1 --dry-run < /tmp/patch.diff patching file drivers/usb/gadget/fsl_mxc_udc.c Hunk #2 FAILED at 36. Hunk #3 FAILED at 66. Hunk #4 FAILED at 105. 3 out of 4 hunks FAILED -- saving rejects to file drivers/usb/gadget/fsl_mxc_udc.c.rej -- balbi
Attachment:
signature.asc
Description: Digital signature
