22 Jan
2011
22 Jan
'11
6:14 a.m.
On Fri, Jan 21, 2011 at 3:49 PM, Stephen Warren swarren@nvidia.com 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