On Wed, 2012-09-05 at 11:19 -0700, Paul E. McKenney wrote: > I tried that, and got a surprisingly large set of conflicts. Ah, OK, > the problem is that breaking up rcu_gp_kthread() into subfunctions > did enough code motion to defeat straightforward rebasing. Is there > some way to tell "git rebase" about such code motion, or would this > need to be carried out carefully by hand?
The alternative is doing that rebase by hand and in the process make that code movement patch (6) obsolete by making patches (1) and (3) introduce the code in the final form :-) Yay for less patches :-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
