[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150627080928.GA4783@gmail.com>
Date: Sat, 27 Jun 2015 10:09:28 +0200
From: Ingo Molnar <mingo@...nel.org>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Tejun Heo <tj@...nel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Lai Jiangshan <laijs@...fujitsu.com>,
"Paul E. McKenney" <paulmck@...ibm.com>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>
Subject: Re: [GIT PULL] workqueue changes for v4.2-rc1
* Linus Torvalds <torvalds@...ux-foundation.org> wrote:
> On Fri, Jun 26, 2015 at 9:01 AM, Tejun Heo <tj@...nel.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.
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists