lkml.org 
[lkml]   [2015]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [GIT PULL] workqueue changes for v4.2-rc1
From
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?

Linus


\
 
 \ /
  Last update: 2015-06-27 05:41    [W:0.063 / U:1.548 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site