On Thu, Mar 21, 2013 at 11:48:17AM -0400, Alan Stern wrote: > On Wed, 20 Mar 2013, Greg KH wrote: > > > Ok, I applied your ehci patch to my usb-linus branch and merged it into > > usb-next, and I know I got the merge wrong for the ehci watchdog logic. > > So if you could send me a patch fixing that up, and then resend these > > remaining patches, we should be all set, right? > > Boy, what a mess. > > Okay, I see what you did, and yes, it isn't quite right. Would you > like me to tell you what the correct resolution for that merge should > be, or would you prefer a separate patch to go on top of your merge? A separate patch on top of the merge to fix it up, as I can't back out the merge commit now. thanks, greg k-h -- 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
