On Fri, Mar 20, 2015 at 4:05 PM, Benjamin Herrenschmidt <benh@xxxxxxxxxxx> wrote: > On Fri, 2015-03-20 at 09:34 -0500, Bjorn Helgaas wrote: >> On Fri, Mar 20, 2015 at 12:43 AM, Gavin Shan <gwshan@xxxxxxxxxxxxxxxxxx> wrote: >> > On Fri, Mar 20, 2015 at 11:06:16AM +0800, Wei Yang wrote: >> > >> > [snip] >> > >> >>--- >> >>v14: >> >> * call ppc_md.pcibios_fixup_sriov() in pcibios_add_device >> >> * add more explanation in change log >> >> * Following patches have been reordered to the beginning. >> >> "EEH refactor to use pci_dn": >> >> 8ec20d6 powerpc/powernv: Use pci_dn, not device_node, in PCI config accessor >> >> a3460fc powerpc/pci: Refactor pci_dn >> >> These two patches will be modified to merge with other patches which are >> >> under discussion/review in ppc mail list. Some changes may also be made in >> >> other patches, which I didn't include them in this series, so that the >> >> auto build robot could work on this. >> > >> > The comment here isn't precise enough and not the things I suggested before. >> > Those 2 patches have been split into 3 patches (A/B/C). Some other EEH >> > cleanup/refactor patches depends on A/B and those patches would be merged >> > before your SRIOV patches to PowerPC tree. C, which I already sent to you, >> > need to be integrated to your patchset right after the following one: >> > >> > powerpc/pci: Don't unset PCI resources for VFs >> > >> > I guess you can move the patches around after checking if Bjorn has further >> > concerns/comments. >> >> I think we need to move forward on this soon so it has at least a >> little time in -next. And it sounds like I cannot merge this v14 >> as-is because it doesn't include these additional EEH cleanup/refactor >> patches? (If they are only cleanup and refactoring, I don't >> understand why they would be required, but I haven't seen them, so I'm >> taking your word for it.) >> >> So I guess I'm waiting for v15. Don't wait for my comments on v14. >> Ideally I'd also like an ack from a powerpc maintainer. This has so >> much powerpc impact that I'm not comfortable stuffing this in without >> their OK. > > The other option is you put the generic changes in a topic branch which > both of us merge and I take care of the rest. Yeah, I chatted with Wei this morning, and he reminded me that there's really not very much drivers/pci content there. So I think I can just ack those bits and you can take the whole thing. I noticed some changelog typos I'll point out, then I'll be done. Bjorn -- 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
