On Fri, 15 Apr 2016 09:19:51 -0700 Tony Lindgren <tony@xxxxxxxxxxx> wrote: > > > 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. Okay, in this case, that's pretty much what I did from the beginning, except the immutable branch was provided by Roger (based on 4.6-rc1). Thanks for this detailed explanation, I'll try to remember that when I'll need to provide an immutable branch for another subsystem. Roger, my request remains, could you check/test my conflict resolution (branch nand/next-with-gpmc-rework)? Thanks, Boris -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -- 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
