From: Frederic Weisbecker <frederic@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Paul E. McKenney" <paulmck@kernel.org>,
Jens Axboe <axboe@kernel.dk>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the rcu tree with the block tree
Date: Fri, 12 Feb 2021 16:18:53 +0100 [thread overview]
Message-ID: <20210212151853.GC94816@lothringen> (raw)
In-Reply-To: <20210211164852.7489b87d@canb.auug.org.au>
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?
next prev parent reply other threads:[~2021-02-12 15:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-11 5:48 linux-next: manual merge of the rcu tree with the block tree Stephen Rothwell
2021-02-11 17:38 ` Paul E. McKenney
2021-02-12 15:24 ` Frederic Weisbecker
2021-02-12 15:26 ` Jens Axboe
2021-02-12 16:18 ` Peter Zijlstra
2021-02-12 16:26 ` Jens Axboe
2021-02-12 15:18 ` Frederic Weisbecker [this message]
2021-02-12 15:30 ` Jens Axboe
2021-02-12 15:33 ` Frederic Weisbecker
2021-02-13 2:05 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210212151853.GC94816@lothringen \
--to=frederic@kernel.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.