Messages in this thread | | | Date | Fri, 26 Jun 2015 12:01:52 -0400 | From | Tejun Heo <> | Subject | Re: [GIT PULL] workqueue changes for v4.2-rc1 |
| |
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
| |