On Fri, Dec 26, 2014 at 12:33:36PM +1100, Stephen Rothwell wrote: > Hi Andy, > > On Mon, 22 Dec 2014 11:16:56 -0800 Andy Lutomirski <luto@xxxxxxxxxxxxxx> wrote: > > > > I'm re-adding the branch, since 3.19-rc1 is out, the change appears to > > still exist as-is in your tree, and it merges cleanly and builds in > > the latest -next for me. Let me know if this will be problematic for > > any reason. > > So, now we have a problem because Paul has rebased a whole set of > commits that you have in your tree. Commits c6dc129cf2d1 to > f58d100f65ae in your tree Paul has rebased on top of v3.19-rc1. If you > are going to base your tree on (part of) Paul's tree, then Paul has to > agree to not rebase that part of his tree or you have to keep a watch > on his tree and rebase you tree on top of those rebased commits. > Really, the first should happen. Apologies, Stephen -- I do seem to be your problem child at the moment! The desried commit is "rcu: Make rcu_nmi_enter() handle nesting", correct? Once confirmed or corrected, I will place this commit at the base of my 3.20 tree, which will rebase it one last time, then avoid rebasing it in the future, at least assuming no more bugs in that particular commit. Thanx, Paul -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
