From: Jens Axboe <axboe@kernel.dk>
To: paulmck@kernel.org, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Frederic Weisbecker <frederic@kernel.org>,
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 08:26:56 -0700 [thread overview]
Message-ID: <d4232318-0e44-445d-a7a3-1e2a018c824e@kernel.dk> (raw)
In-Reply-To: <20210211173802.GM2743@paulmck-ThinkPad-P72>
On 2/11/21 10:38 AM, 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.
>
> 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 pulled these in from sched/core looks like, because there was a dependency
for 2 block fixes from Sebastian:
https://git.kernel.dk/cgit/linux-block/log/?h=for-5.12/block-ipi
But I think I made a mistake in that it should've been sched/smp instead,
which would likely get rid of this issue too? I'll rebase it, it's just
a single topic branch with just those two patches on top.
--
Jens Axboe
next prev parent reply other threads:[~2021-02-12 15:27 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 [this message]
2021-02-12 16:18 ` Peter Zijlstra
2021-02-12 16:26 ` Jens Axboe
2021-02-12 15:18 ` Frederic Weisbecker
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=d4232318-0e44-445d-a7a3-1e2a018c824e@kernel.dk \
--to=axboe@kernel.dk \
--cc=frederic@kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox