On Sat, Apr 02, 2011 at 04:35:17AM -0400, CAI Qian wrote: > After applied this patch and the rest of Andiry's larger USB 3.0 hub power management patches on the top of linus tree, there is a conflict with patch [5/5] here. > > http://marc.info/?l=linux-usb&m=130136847804961&w=2 You need to apply the five patches _instead_ of Andiry's quick suspend fix patch. So try applying just the five patches on top of Linus' tree. 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