From: Ingo Molnar <mingo@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Tejun Heo <tj@kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Paul E. McKenney" <paulmck@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Thomas Gleixner <tglx@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] RCU changes for v5.5
Date: Tue, 26 Nov 2019 09:10:19 +0100 [thread overview]
Message-ID: <20191126081019.GA98591@gmail.com> (raw)
In-Reply-To: <20191125105326.GA20115@gmail.com>
* Ingo Molnar <mingo@kernel.org> wrote:
> Linus,
>
> Please pull the latest core-rcu-for-linus git tree from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-rcu-for-linus
>
> # HEAD: 43e0ae7ae0f567a3f8c10ec7a4078bc482660921 Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
> kernel/workqueue.c | 10 +-
Merge conflict note, the following commit from the RCU tree:
5a6446626d7e: ("workqueue: Convert for_each_wq to use built-in list check")
... will conflict with the following commit from the workqueue tree,
which you already pulled:
49e9d1a9faf2: ("workqueue: Add RCU annotation for pwq list walk")
The merge conflict was also noted by Stephen:
https://lore.kernel.org/r/20191118150858.1a436a12@canb.auug.org.au
The correct resolution is to pick the 5a6446626d7e side, as it's the
latest, best variant of this iteration - you can find this resolution in
tip:master as well.
Thanks,
Ingo
next prev parent reply other threads:[~2019-11-26 8:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-25 10:53 [GIT PULL] RCU changes for v5.5 Ingo Molnar
2019-11-26 8:10 ` Ingo Molnar [this message]
2019-11-27 1:30 ` pr-tracker-bot
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=20191126081019.GA98591@gmail.com \
--to=mingo@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).