For the first time we have a few conflicting pull requests that prevent merging all in the integration branch.
...
I think the simplest way to deal with that is to arbitrarily pick a few that apply cleanly and just DNM the others so they wait for the next round of integration testing. After the first round of integration test, the chosen one will be merged and the DNM will have to be rebased to resolve the conflict, but that's what we do routinely. What do you think ?
I think your suggestion is reasonable and I can't think of any better way to proceed, so +1 !
Nathan -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
