diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-24 00:48:35 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-24 00:48:35 +0200 |
| commit | c2468d32f5a57298b732826af84cdc39745d179c (patch) | |
| tree | adcb5668dbe43a173002f23107e3df8d2a1be396 /Makefile | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | cgroup: replace task_cgroup_path_from_hierarchy() with task_cgroup_path() (diff) | |
| download | linux-c2468d32f5a57298b732826af84cdc39745d179c.tar.xz linux-c2468d32f5a57298b732826af84cdc39745d179c.zip | |
Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup changes from Tejun Heo:
"This contains two patches, both of which aren't fixes per-se but I
think it'd be better to fast-track them.
One removes bcache_subsys_id which was added without proper review
through the block tree. Fortunately, bcache cgroup code is
unconditionally disabled, so this was never exposed to userland. The
cgroup subsys_id is removed. Kent will remove the affected (disabled)
code through bcache branch.
The other simplifies task_group_path_from_hierarchy(). The function
doesn't currently have in-kernel users but there are external code and
development going on dependent on the function and making the function
available for 3.11 would make things go smoother"
* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: replace task_cgroup_path_from_hierarchy() with task_cgroup_path()
cgroup: remove bcache_subsys_id which got added stealthily
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions