6 Apr
2012
6 Apr
'12
6:46 p.m.
On Fri, Apr 06, 2012 at 09:44:16AM -0600, Stephen Warren wrote:
I'm not sure when "things have merged back up" will be; do you intend to merge your for-3.4 branch into for-3.5 at any particular time, or perhaps rebase your for-3.5 onto v3.4-rc2 when its out?
I'll merge up the commit from Linus' tree.
Alternatively, I can regenerate that patch against your for-3.5, but then you'll get a merge conflict when merging in your for-3.4, since the code it affects will have experienced a rename. Should be trivial to resolve though.
If it's trivial to resolve that won't be a problem.