Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jun 2016 17:04:42 +0000 (10:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jun 2016 17:04:42 +0000 (10:04 -0700)
commit52827f389b32f6d04a1bcb4428b5499815c36a24
treedfe33270b8fe68115c1f3f6aff1681ce62182422
parentde4921ce9b3bc68aa530249df8d85cde8edc0968
parent82d6489d0fed2ec8a8c48c19e8d8a04ac8e5bb26
Merge branch 'for-4.7-fixes' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup fixes from Tejun Heo:
 "Three fix patches.  Two are for cgroup / css init failure path.  The
  last one makes css_set_lock irq-safe as the deadline scheduler ends up
  calling put_css_set() from irq context"

* 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: Disable IRQs while holding css_set_lock
  cgroup: set css->id to -1 during init
  cgroup: remove redundant cleanup in css_create