From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>, Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@elte•hu>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
"Joel Fernandes (Google)" <joel@joelfernandes•org>,
"Paul E. McKenney" <paulmck@kernel•org>,
Sebastian Andrzej Siewior <bigeasy@linutronix•de>
Subject: linux-next: manual merge of the workqueues tree with the tip tree
Date: Mon, 18 Nov 2019 15:08:58 +1100 [thread overview]
Message-ID: <20191118150858.1a436a12@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 792 bytes --]
Hi all,
Today's linux-next merge of the workqueues tree got a conflict in:
kernel/workqueue.c
between commit:
5a6446626d7e ("workqueue: Convert for_each_wq to use built-in list check")
from the tip tree and commit:
49e9d1a9faf2 ("workqueue: Add RCU annotation for pwq list walk")
from the workqueues tree.
I fixed it up (I just used the former as it is a superset of the latter)
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-11-18 4:09 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 4:08 Stephen Rothwell [this message]
2019-11-18 9:00 ` linux-next: manual merge of the workqueues tree with the tip tree Sebastian Andrzej Siewior
2019-11-18 12:50 ` Ingo Molnar
2019-11-18 14:56 ` Paul E. McKenney
2019-11-18 15:09 ` Tejun Heo
-- strict thread matches above, loose matches on Subject: below --
2011-12-28 4:37 Stephen Rothwell
2010-12-27 4:38 Stephen Rothwell
2010-08-02 3:26 Stephen Rothwell
2010-07-20 4:46 Stephen Rothwell
2010-07-20 4:46 Stephen Rothwell
2010-07-20 4:46 Stephen Rothwell
2009-11-26 8:00 Stephen Rothwell
2009-11-26 8:12 ` Ingo Molnar
2009-11-26 9:15 ` Tejun Heo
2009-11-26 9:26 ` Ingo Molnar
2009-11-26 9:48 ` Tejun Heo
2009-11-26 9:51 ` Ingo Molnar
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=20191118150858.1a436a12@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bigeasy@linutronix$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=joel@joelfernandes$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=paulmck@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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