> > On Mon, Mar 12, 2018 at 03:49:30PM -0500, Steve Wise wrote: > > > > > There are a bunch of changes to the ethernet driver here.. > > > > > > > > > > If we take this into the rdma tree you are guarenteeing there will be > > > > > no conflicts with anything going on with the ethernet side this cycle? > > > > > > > > > > Would want DaveM's ack on the ethernet part, I think? Why didn't > you > > > > > CC netdev? > > > > > > > > > > Jason > > > > > > > > Hey Jason, Yes, this series should CC netdev for sure. Previously, we > > have > > > > been able to pull these types of series' through either netdev or > > linux-rdma > > > > with the ACK from the other maintainer. > > > > > > We usually want to see these as pull requests if they really need to > > > go to both trees.. Which means you need a k.o account, I think. > > > > > > uapi changes like this need to be explicitly acked by RDMA though. > > > > > > > I'm not sure how we "guarantee there will be no conflicts"? > > > > > > Don't send any patches to netdev that would conflict.. > > > > So chelsio would get an account on k.o to stage this series. Then ask both > > Dave and you/doug to pull the series (once reviewed and accepted) from > a k.o > > git tree. > > If you are doing this often, and if it is typically at risk of making > conflicts, then yes. > > > And after that, any commits against cxgb4 and iw_cxgb4 submitted > > by chelsio should be based on top of this series until it merges into > > linus's tree. > > You can do that, yes, or you can carefully manage what you sent to > both trees to avoid overlap. > > It really depends how much churn your driver is getting. > > In this case, if you say you don't expect to create conflicts we can > take this into RDMA without PRs, but we still need DaveM's ack. If we did this, and then chelsio does indeed have some cxgb4 patch that really needs to be on top of the srq series, do we submit them to be merged into linux-rdma with Dave's ACK? Or does Dave pull in the prereq srq series? Or are you saying, if such a patch is inevitable, then the srq series needs to be pulled into both Netdev and linux-rdma. This is tricky. 😊 -- 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
