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. 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? The two pull requests I'm considering sending you are: https://git.kernel.org/cgit/linux/kernel/git/sarah/xhci.git/log/?h=for-usb-linus-queue https://git.kernel.org/cgit/linux/kernel/git/sarah/xhci.git/log/?h=for-usb-next-queue I've been testing the for-usb-next-queue branch on top of 3.12-rc6 for the last week, and the patches are stable. 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
