On Mon, Aug 7, 2017 at 10:19 PM, Christopher Li <sparse@xxxxxxxxxxx> wrote: > > Let me repeat. The "for-chris" branch should: > 1. fast forwardable from master > 2. contain *all* of the patches from you that want me to pull. > > "for-chris" doesn't need to be always fast forward-able to the > last "for-chris" point. > > If you need to fix the "for-chris" for some v4-> v5. Go ahead > and rebase the "for-chris" as you like. It is your call how to > make "for-chris" stable the way you like. > > The implications is that. You practically define the stable part > of the master branch. My sparse-next will always use your > "for-chris" as base. > > I think that will be the best way for our current development > model. It give you to control the stable point on master, it give > me the flexibility to rebase spase-next. Please ignore that. I will drop the rebase on sparse-next and do integration on master. Master will never rebase and rollback. If there is a bug get merged. It will be fix as new commits to master. 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
