On Fri, Jan 21, 2011 at 3:49 PM, Stephen Warren <swarren@xxxxxxxxxx> wrote: > Mark Brown wrote on Sent: Friday, January 21, 2011 4:42 PM: >> The usual thing here would be a branch that gets merged into both trees >> (to avoid the commit getting duplicated) or to only apply in one tree and >> let things sort themselves out in -next and the merge window. > > Ah yes, I do remember you mentioning that before. Now I realize exactly > what you mean. Sounds overly complicated to me since you don't already have a tree hosted somewhere. Mark; why don't you apply it with Colin's acked-by, and Colin can just cherry-pick from that for-next branch? -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html