On Wed, Nov 27, 2013 at 01:51:05PM -0800, Greg KH wrote: > On Wed, Nov 27, 2013 at 01:42:40PM -0800, Sarah Sharp wrote: > > Hi Greg, > > > > I've got a potential pull request to send you for usb-next, but I wanted > > to get your advice on it first. It contains a series of patches from > > Xenia to remove the xhci_readl/writel variants in order to just replace > > them with standard readl and writel calls. > > > > Normally I would queue these for usb-next. However, any bug fix patch > > that will be queued for usb-linus that touches code around xHCI register > > reads or writes is going to cause merge conflicts in usb-next. > > And what's the odds of that really happening? > > > The register manipulation is scattered all through the driver, so it's > > pretty likely we will get a merge conflict sometime in 3.13. How do > > you want me to handle any merge conflicts, or will you handle them? > > I can handle them. If they are too tough, I'll ask for help :) Ok, thanks! Sarah Sharp -- 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
