* Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx> [160415 09:06]: > On Fri, 15 Apr 2016 08:41:40 -0700 > Tony Lindgren <tony@xxxxxxxxxxx> wrote: > > Well the rules are that if something agreed to be immutable, then > > it will never get redone. And the immutable branch should be based > > on the absolute minimal set of patches against some earlier tag, > > usually -rc1 is a good one. This avoids other tree to need to pull > > in a huge amount of changes from other trees just to avoid merge > > conflicts. > > How would you do it in this particular case. Say I have to provide you > with an immutable branch, it should only contain Roger's patches, right? Well ideally it would be just minimal NAND related changes branch against v4.6-rc1. Then if Roger has a dependency to that, Roger can pull it in. Then Roger would make a branch for the GPMC changes against your minimal NAND branch. Then if there were non-trivial merge conflicts, I could pull in Roger's GPMC branch as needed. But in this case, it seems you can just merge everything via the NAND tree and problem solved. > But this also means this immutable branch has to be pulled into my > nand/next branch before all other changes touching the same set of > files, which in turn means that I'll have to rebase and push -f my > nand/next branch (which I'd like to avoid). Yeah let's not do rebases, there should be no need for it. > Or should I just pull this immutable branch in my current nand/next and > let you pull the same immutable branch in omap-soc. I mean, would this > prevent conflicts when our branches are merged into linux-next, no > matter the order. Ideally just one or more branches with just minimal changes in them against -rc1. But you may have other dependencies in your NAND tree so that may no longer be doable :) Usually if I merge something that may need to get merged into other branches, I just apply them into a separate branch against -rc1 to start with, then merge that branch in. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
