From: "Steve Wise" <swise@xxxxxxxxxxxxxxxxxxxxx> Date: Wed, 14 Mar 2018 10:31:24 -0500 > This issue has also been dealt-with for Mellanox drivers, I believe. I take > it the solution for them was a k.o. signed repo, that they maintain, where > both linux-rdma and netdev take PRs from for commits that are needed in both > repos. Then these are reconciled when both repos are merged into Linus' > repo. (I hope my understanding of this is correct) > > For Chelsio, this is perhaps a possibility, but I'm wondering if there is a > simpler solution? A few other option we've been discussing include: > > 1) submit the cxgb4-only changes to netdev in release cycle X, and then only > submit the iw_cxgb4 (or other upper drivers) changes that use them in > release cycle X+1. The pro of this is simplicity. The con is timeliness - > it takes 2 release cycles to get the feature upstream. > > 2) run the entire series through one maintainer's repo (with all > maintainers' ACK on the content and plan, of course), and ensuring no > conflicting commits are submitted for the rest of that release cycle. I'm > not really sure that this is feasible given anyone could create commits for > upstream drivers. So how could Chelsio really control this? > > Do you have any suggestions on how we should proceed? I think the Mellanox setup is working well currently. If the changes get pulled into both the rdma and networking tree, then it all gets resolved cleanly no matter which of rdma or networking goes into Linus's tree first during the merge window. It doesn't have the delay issues of suggestion #1, and I think avoiding conflicts in situation #2 is next to impossible. In fact, such conflict problems are how we arrived at the approach Mellanox is using in the first place. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
