On Thu, Feb 17, 2011 at 07:19:01PM +0200, Felipe Balbi wrote: > On Thu, Feb 17, 2011 at 08:37:31AM -0800, Greg KH wrote: > > On Thu, Feb 17, 2011 at 10:26:22AM +0200, Felipe Balbi wrote: > > > Hi Greg, > > > > > > Do you have plans to merge v2.6.38-rc5 into usb-next ? > > > > Yes, I've been swamped with the recent -stable kernel releases to be > > able to do this just yet. Hopefully in a few hours I will have this > > done. > > > > > There are few musb patches that went in on -rc5 and without > > > them my pull request will conflict like the last one. > > > > > > Let me know if you're planning to merge -rc5 on your usb-next branch so > > > that I can make a clean pull request. > > > > Hopefully your pull request will still work, after I fix up the obvious > > merge conflict. > > When you fix, I'll re-test everything just to be sure ;-) Ok, I've merged and pushed out usb-next now, care to rebase your musb patches and resend me the pull request? 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
