From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752531AbbFZQCB (ORCPT ); Fri, 26 Jun 2015 12:02:01 -0400 Received: from mail-yk0-f169.google.com ([209.85.160.169]:35126 "EHLO mail-yk0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752353AbbFZQBz (ORCPT ); Fri, 26 Jun 2015 12:01:55 -0400 Date: Fri, 26 Jun 2015 12:01:52 -0400 From: Tejun Heo To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Lai Jiangshan Subject: Re: [GIT PULL] workqueue changes for v4.2-rc1 Message-ID: <20150626160152.GH15805@mtj.duckdns.org> References: <20150626153552.GF15805@mtj.duckdns.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150626153552.GF15805@mtj.duckdns.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 26, 2015 at 11:35:52AM -0400, Tejun Heo wrote: > Hello, Linus. > > Most of the changes are around implementing and fixing fallouts from > sysfs and internal interface to limit the CPUs available to all > unbound workqueues to help isolating CPUs. It needs more work as > ordered workqueues can roam unrestricted but still is a significant > improvement. 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. 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. Thanks. -- tejun