On Mon, 18 Mar 2013, Greg KH wrote: > This patch fails to apply to my usb-next branch, after the 4 previous > patches were applied: > > checking file drivers/usb/host/ehci-q.c > Hunk #2 FAILED at 123. > Hunk #3 succeeded at 545 (offset -8 lines). > Hunk #4 succeeded at 557 (offset -8 lines). > Hunk #5 succeeded at 945 (offset -8 lines). > 1 out of 5 hunks FAILED > checking file drivers/usb/host/ehci-sched.c > > Any ideas? I can't apply the rest of them, so can you fix this up and > just resend this, and the remaining patches?
The problem is that I do my development in a "work" branch that includes both of your usb-linus and usb-next branches, merged together. Or if you want to put it another way, I do my development in a single branch that includes -stable and -current material as well as stuff for -next. It seems foolish not to do this, since the -next patches will eventually have to merge into a kernel that includes the others -- not to mention that some of the -next work _depends_ on the other changes. In particular, this patch was based on a kernel that already has commit feca7746d5d9 applied -- that commit is in your usb-linus branch but not usb-next. That explains why you couldn't apply this patch; it touches some of the same code as feca7746d5d9. How should we handle this? Alan Stern -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
