On Mon, Sep 10, 2012 at 12:03:31PM -0600, Stephen Warren wrote:
Anyway, since this patch didn't make 3.6-rc5, it is difficult for me to use as a baseline for any branches destined for 3.7, since I'm supposed to send my pull requests to arm-soc before 3.6-rc6 is released, yet if this patch goes into 3.6, it won't be there until 3.6-rc6 at the earliest.
I'm not sure how best to resolve this; is it possible for me to take the patch through the Tegra tree instead, as I originally intended?
Just merge the pull request in. I should send something out on Thursday I expect, though no guarantees about -rc6. It doesn't seem sensible to not merge the fix.
Or bend the rules for arm-soc by putting it in your own -next branch and then rebasing before it gets pulled into arm-soc. This would seem a sensible thing in general given arm-soc has this sort of model, it'd avoid what is essentially an extended merge window for arm-soc but still give things exposure in -next before they hit arm-soc itself.