Re: [GIT PULL] workqueue changes for v4.2-rc1

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Newsgroups	linux.kernel
Subject	Re: [GIT PULL] workqueue changes for v4.2-rc1
Date	Mon, 29 Jun 2015 23:00:02 +0200
Message-ID	<pGOjM-5WS-17@gated-at.bofh.it> (permalink)
References	<pFDTr-2ST-3@gated-at.bofh.it> <pFEmu-3FZ-9@gated-at.bofh.it> <pFOOR-1Rz-1@gated-at.bofh.it> <pFTlv-8mi-1@gated-at.bofh.it> <pG19o-2wN-15@gated-at.bofh.it> <pGBcS-3QX-5@gated-at.bofh.it>
X-Original-To	Ingo Molnar <mingo@kernel.org>
X-Helo	d03dlp03.boulder.ibm.com
X-Mailfrom	paulmck@linux.vnet.ibm.com
X-Rcptto	linux-kernel@vger.kernel.org
Reply-To	paulmck@linux.vnet.ibm.com
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
User-Agent	Mutt/1.5.21 (2010-09-15)
X-Tm-As-Mml	disable
X-Content-Scanned	Fidelis XPS MAILER
X-Cbid	15062920-0013-0000-0000-000012810489
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	60
Organization	linux.* mail to news gateway
X-Original-Cc	Linus Torvalds <torvalds@linux-foundation.org>, Tejun Heo <tj@kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Lai Jiangshan <laijs@cn.fujitsu.com>, Peter Zijlstra <a.p.zijlstra@chello.nl>
X-Original-Date	Mon, 29 Jun 2015 13:51:20 -0700
X-Original-Message-ID	<20150629205120.GP3717@linux.vnet.ibm.com>
X-Original-References	<20150626153552.GF15805@mtj.duckdns.org> <20150626160152.GH15805@mtj.duckdns.org> <CA+55aFw+3JDVCz5=rM+chF4HuEKqD_ob1A5SpEbHdatnrGekOA@mail.gmail.com> <20150627080928.GA4783@gmail.com> <20150627162056.GD3717@linux.vnet.ibm.com> <20150629065220.GA17509@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1174106

Show key headers only | View raw

On Mon, Jun 29, 2015 at 08:52:20AM +0200, Ingo Molnar wrote:
> 
> * Paul E. McKenney <paulmck@linux.vnet.ibm.com> wrote:
> 
> > On Sat, Jun 27, 2015 at 10:09:28AM +0200, Ingo Molnar wrote:
> > > 
> > > * Linus Torvalds <torvalds@linux-foundation.org> wrote:
> > > 
> > > > On Fri, Jun 26, 2015 at 9:01 AM, Tejun Heo <tj@kernel.org> wrote:
> > > > >
> > > > > Ooh, it isn't in mainline yet but pulling rcu tree will cause a silent
> > > > > conflict with this pull request which leads to build failure.
> > > > 
> > > > I tend to try to do a full "make allmodconfig" build between all pull
> > > > requests (although I can optimize that a bit for very targeted pull
> > > > requests), so hopefully I'll notice and remember your note.
> > > > 
> > > > But just in case:
> > > > 
> > > > > The two colliding commits are.
> > > > >
> > > > >  5b95e1af8d17 ("workqueue: wq_pool_mutex protects the attrs-installation")
> > > > >  eeacf8982637 ("rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()")
> > > > >
> > > > > The former adds rcu_lockdep_assert() usage and the latter renames and flips 
> > > > > it.  It can be resolved by renaming and negating the conditions in the new 
> > > > > usage.
> > > > 
> > > > it would be great if when I get the RCU pull request that introduces that 
> > > > renaming, whoever sends it to me could remind me about it.
> > > > 
> > > > I'm assuming the pull request will come through Ingo. Ingo?
> > > 
> > > Yeah.
> > > 
> > > There was some discussion about how to warn about RCU failures precisely, so I 
> > > think Paul yanked the new style RCU warnings for the time being. When/if they
> > > come back I'll be careful and will remind you of semantic conflicts.
> > 
> > Yes, it ended up in the batch destined for v4.3.
> > 
> > If it would make things easier, I could easily introduce the new API in
> > v4.3, along with the changes visible at that time, and pull the old API
> > in v4.4.  That way, the conflicts appearing in v4.4 could be resolved
> > in the originating tree, given that the new API would then be in place
> > everywhere.
> > 
> > Either way works for me, just let me know!
> 
> I think having it all in v4.3 is perfectly fine!

Will do!

							Thanx, Paul

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Re: [GIT PULL] workqueue changes for v4.2-rc1 Ingo Molnar <mingo@kernel.org> - 2015-06-27 10:10 +0200
  Re: [GIT PULL] workqueue changes for v4.2-rc1 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-06-29 23:00 +0200

csiph-web