From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: Frederic Weisbecker <frederic@kernel.org>,
"Paul E. McKenney" <paulmck@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: Sat, 13 Feb 2021 13:05:18 +1100 [thread overview]
Message-ID: <20210213130518.3747a678@canb.auug.org.au> (raw)
In-Reply-To: <858e7874-83c9-e4b9-a0a9-31be5a0c853e@kernel.dk>
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
Hi all,
On Fri, 12 Feb 2021 08:30:27 -0700 Jens Axboe <axboe@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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2021-02-13 2:06 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
2021-02-12 15:30 ` Jens Axboe
2021-02-12 15:33 ` Frederic Weisbecker
2021-02-13 2:05 ` Stephen Rothwell [this message]
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=20210213130518.3747a678@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=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 \
/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