On Wed, Aug 9, 2017 at 8:32 PM, Luc Van Oostenryck <luc.vanoostenryck@xxxxxxxxx> wrote: > > I have no problem for you to take only till the preceding ref. > But as we agreed and so that you just have something that fast-forward to > master *all* the changes must come from my tree first. I do the integration > and you just pull from me. > It's exactly what you asked and we agreed, right? > We agree to give this a try. I already realize this is not going to work. Please drop that. One big consideration is that, I give up the "clean up the history" thing on sparse-next. So no more rebase on the sparse-next. >From now on I will just do the normal git merge on master. I don't think we need to go through your branch again, because there is no leading sparse-next any more. So the model will be, you give me pull request. I either give feed back or just merge it. If there is a bug or improvement. We will do incremental fix on master. Just like the other git base open source project. I will never rebase any thing on master, especially your changes. Sorry about going back and forth. I think that is the right thing to do. It will actually simplify things a lot. I admit the "clean up of history" thing is stupid. Linus was right about that. I should just do the normal merges and take your tree as it is. So you can actually just send me the topic changes merge request. If you want to send me combined merge request that is fine too. Branch name does not matter any more. Please give me a bit time to release RC5 before revisit your new patches. Thanks for the great work. Chris -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
