On 20 June 2017 at 09:17, Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> wrote: > Hi Ulf, > > It looks like you rebase mmc/next almost daily. Is there any specific reason > for that? I don't do it daily, but often, yes. :-) > > I'm asking because I create a "renesas-drivers" tree on a regular basis > (cfr. e.g. https://www.spinics.net/lists/linux-renesas-soc/msg15111.html). > This tree is meant to ease development of platform support and drivers > for Renesas ARM SoCs. It is created by merging (a) the for-next branches > of various subsystem trees and (b) branches with driver code submitted > or planned for submission to maintainers into the development branch of > Simon Horman's renesas.git tree. If you are asking me to keep my next branch immutable, then please no, I don't like to do that. Reason explained below. I don't have a problem to share specific renesas mmc branches with you, if that helps? > > If for (b), people submit driver code based on mmc/next, it may start > to conflict > with subsequent mmc/next releases soon, requiring the submitter or me to > rebase the code before including it in renesas-drivers. > > Most subsystem maintainers don't rebase their for-next branch, unless there's > a very good reason for it (e.g. a serious breakage hindering bisection). I do it for a couple of reasons. First, sometimes I apply changes before people have provided enough tested by tags, to instead allow the changes to be tested in linux-next. This may lead to some situations when I need to re-base my next branch. *) Something breaks, then I need to drop the changes. Revert doesn't play well here, especially if it's a series of changes. **) Avoid breaking bisect. ***) I want to give people cred, adding peoples tested-by, reviewed-by tags, after the changes have been queued on my next branch. Second, even if the changes queued on next has been thoroughly tested, sometimes error reports still show up. I most cases I prefer to avoid breaking bisect, which then leaves me in no other option, but re-basing my branch (to either drop changes or amend them). I guess what I can do, is to host a pre-next branch, which serves as my pre-integration branch, before I moves things to next. However, this does put some more administrative work on me, so I would like to avoid that. I am trying to understand the purpose of your renesas integration tree, and why it's a problem for you to pick up my re-based branch? Could you perhaps elaborate on this? Kind regards Uffe
