tree 925b7a712271db7cdd37835faadf472499156381
parent dd1277d2ad95e7f0de1b79c70fdfe635d9df0f80
parent 9b3c4ab3045e953670c7de9c1165fae5358a7237
author Paul E. McKenney <paulmck@kernel.org> 1635805486 -0700
committer Paul E. McKenney <paulmck@kernel.org> 1635805486 -0700

Merge commit '9b3c4ab3045e953670c7de9c1165fae5358a7237' into rcu-merge.2021.11.01a

Test merge of RCU commmit 18f08e758f34 ("rcu-tasks: Add
trc_inspect_reader() checks for exiting critical section") and -tip commit
9b3c4ab3045e ("sched,rcu: Rework try_invoke_on_locked_down_task()").

This conflict was noted and fixed by Stephen Rothwell during -next testing.
https://lore.kernel.org/all/20211012154828.312f870f@canb.auug.org.au/
His fix has received extensive testing, including rcutorture testing.
This merge commit mirrors his.