From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 May 2014 09:36:40 +0000 (+0900)
Subject: Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: firefly_0821_release~176^2~3898
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=06eb4cc2e7ad1b32a3b2580eff772c29b53a2cc6;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.15-fixes' of git://git./linux/kernel/git/tj/cgroup

Pull more cgroup fixes from Tejun Heo:
 "Three more patches to fix cgroup_freezer breakage due to the recent
  cgroup internal locking changes - an operation cgroup_freezer was
  using now requires sleepable context and cgroup_freezer was invoking
  that while holding a spin lock.  cgroup_freezer was using an overly
  elaborate hierarchical locking scheme.

  While it's possible to convert the hierarchical spinlocks directly to
  mutexes, this patch simplifies the overall locking so that it uses a
  global mutex.  This has the added benefit of avoiding iterating
  potentially huge number of tasks under a spinlock.  While the patch is
  on the larger side in the devel cycle, the changes made are mostly
  straight-forward and the locking logic is a lot simpler afterwards"

* 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: fix rcu_read_lock() leak in update_if_frozen()
  cgroup_freezer: replace freezer->lock with freezer_mutex
  cgroup: introduce task_css_is_root()
---

06eb4cc2e7ad1b32a3b2580eff772c29b53a2cc6