> I ran into a problem with this change. This line, removing a line > consisting of only a single tab, appears to conflict with a patch > earlier in this series. I had to manually remove just the change that > removed that line to get this patch to apply. Any idea what's going on? > >> return 0; >> } >> #endif /* PM */ Hi Paul, Thanks for your review and test very much! Because this series was based Bjorn's pci-next branch, so maybe this is the cause, although I don't find any difference between Bjorn's pci-next tree and Linus master tree. I will refresh this patch. Thanks! Yijing. -- Thanks! Yijing -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html