Hi all,
On Fri, 12 Feb 2021 08:30:27 -0700 Jens Axboe <ax...@kernel.dk> wrote:
>
> On 2/12/21 8:18 AM, Frederic Weisbecker 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")
> >> from the block tree and commits:
> >
> > Isn't it tip:/sched/core instead of block?
>
> It must be, maybe block just got merged first? It's just sched/core in a
> topic branch, to satisfy a dependency.Well, yes, it is a topic branch merge into the block tree. However, that topic branch has not been merged into the tip/auto-latest branch which is what linux-next pulls in as the tip tree. (And the tip tree and block trees were both merged before the rcu tree.) -- Cheers, Stephen Rothwell
pgpML3kYzCm3t.pgp
Description: OpenPGP digital signature
