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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CA+55aFw+3JDVCz5=rM+chF4HuEKqD_ob1A5SpEbHdatnrGekOA@mail.gmail.com>
Date:	Fri, 26 Jun 2015 20:18:10 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Tejun Heo <tj@...nel.org>, Ingo Molnar <mingo@...nel.org>
Cc:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Lai Jiangshan <laijs@...fujitsu.com>
Subject: Re: [GIT PULL] workqueue changes for v4.2-rc1

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?

                      Linus
--
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/