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")
> from the block tree and commits:
Isn't it tip:/sched/core instead of block?
