| Date | Tue, 19 May 2020 08:28:10 -0400 | From | Joel Fernandes <> | Subject | Re: [patch V6 00/37] x86/entry: Rework leftovers and merge plan |
| |
On Sat, May 16, 2020 at 10:18:45AM -0700, Paul E. McKenney wrote: > On Sat, May 16, 2020 at 01:45:47AM +0200, Thomas Gleixner wrote: > > [ . . . ] > > > - noinstr-rcu-nmi-2020-05-15 > > > > Based on the core/rcu branch in the tip tree. It has merged in > > noinstr-lds-2020-05-15 and contains the nmi_enter/exit() changes along > > with the noinstr section changes on top. > > > > This tag is intended to be pulled by Paul into his rcu/next branch so > > he can sort the conflicts and base further work on top. > > And this sorting process is now allegedly complete and available on the > -rcu tree's "dev" branch. As you might have guessed, the major source > of conflicts were with Joel's patches, including one conflict that was > invisible to "git rebase": > > 1b2530e7d0c3 ("Revert b8c17e6664c4 ("rcu: Maintain special bits at bottom of ->dynticks counter") > 03f31532d0ce ("rcu/tree: Add better tracing for dyntick-idle") > a309d5ce2335 ("rcu/tree: Clean up dynticks counter usage") > 5c6e734fbaeb ("rcu/tree: Remove dynticks_nmi_nesting counter") > > This passes modest rcutorture testing. So far, so good! ;-)
Also I double checked these patches in the rcu/dev branch. It looks good to me, thanks for resolving the conflicts!!
- Joel
|