Subject: Re: linux-next: manual merge of the rcu tree with the block tree

From: Frederic Weisbecker <[email-masked]>
Date: Fri, 12 Feb 2021 16:24:40 +0100

On Thu, Feb 11, 2021 at 09:38:02AM -0800, Paul E. McKenney wrote:
> On Thu, Feb 11, 2021 at 04:48:52PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the rcu tree got conflicts in:
> > 
> >   include/linux/rcupdate.h
> >   kernel/rcu/tree.c
> >   kernel/rcu/tree_plugin.h
> > 
> > between commits:
> > 
> >   3a7b5c87a0b2 ("rcu/nocb: Perform deferred wake up before last idle's need_resched() check")
> >   e4234f21d2ea ("rcu: Pull deferred rcuog wake up to rcu_eqs_enter() callers")
> >   14bbd41d5109 ("entry/kvm: Explicitly flush pending rcuog wakeup before last rescheduling point")
> 
> Frederic had me move these out of the section of the -rcu commits for
> the v5.12 merge window, saying that they were not yet ready.

Actually those are the latest series applied in tip:sched/core

> 
> Jens, are these needed to prevent failures in the block tree?  If so,
> there were some commits added late in v5.11 that might also get rid
> of your failures.  If those v5.11 commits don't help the block tree,
> let's figure out what we need to do here...  ;-)

I'm surprised those are in the block tree. Perhaps some commits there
depend on sched/core

Thanks!