Linus Torvalds 88d6ae8dc3 Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup ... Pull cgroup updates from Tejun Heo: "cgroup file type addition / removal is updated so that file types are added and removed instead of individual files so that dynamic file type addition / removal can be implemented by cgroup and used by controllers. blkio controller changes which will come through block tree are dependent on this. Other changes include res_counter cleanup and disallowing kthread / PF_THREAD_BOUND threads to be attached to non-root cgroups. There's a reported bug with the file type addition / removal handling which can lead to oops on cgroup umount. The issue is being looked into. It shouldn't cause problems for most setups and isn't a security concern." Fix up trivial conflict in Documentation/feature-removal-schedule.txt * 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits) res_counter: Account max_usage when calling res_counter_charge_nofail() res_counter: Merge res_counter_charge and res_counter_charge_nofail cgroups: disallow attaching kthreadd or PF_THREAD_BOUND threads cgroup: remove cgroup_subsys->populate() cgroup: get rid of populate for memcg cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg cgroup: make css->refcnt clearing on cgroup removal optional cgroup: use negative bias on css->refcnt to block css_tryget() cgroup: implement cgroup_rm_cftypes() cgroup: introduce struct cfent cgroup: relocate __d_cgrp() and __d_cft() cgroup: remove cgroup_add_file[s]() cgroup: convert memcg controller to the new cftype interface memcg: always create memsw files if CONFIG_CGROUP_MEM_RES_CTLR_SWAP cgroup: convert all non-memcg controllers to the new cftype interface cgroup: relocate cftype and cgroup_subsys definitions in controllers cgroup: merge cft_release_agent cftype array into the base files array cgroup: implement cgroup_add_cftypes() and friends cgroup: build list of all cgroups under a given cgroupfs_root cgroup: move cgroup_clear_directory() call out of cgroup_populate_dir() ...		2012-05-22 17:40:19 -07:00
..
partitions	s390/dasd: re-prioritize partition detection message	2012-05-16 14:42:51 +02:00
blk-cgroup.c	cgroup: convert all non-memcg controllers to the new cftype interface	2012-04-01 12:09:55 -07:00
blk-cgroup.h
blk-core.c	block: make auto block plug flush threshold per-disk based	2012-04-06 11:37:47 -06:00
blk-exec.c
blk-flush.c
blk-integrity.c
blk-ioc.c	block: fix ioc leak in put_io_context	2012-03-14 15:34:48 +01:00
blk-iopoll.c
blk-lib.c
blk-map.c
blk-merge.c	block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions	2012-02-08 09:19:38 +01:00
blk-settings.c
blk-softirq.c	sched, block: Unify cache detection	2012-01-27 13:28:48 +01:00
blk-sysfs.c
blk-tag.c
blk-throttle.c	block: use lockdep_assert_held for queue locking	2012-03-30 12:33:28 +02:00
blk-timeout.c
blk.h	Merge branch 'linus' into sched/core	2012-03-01 10:26:43 +01:00
bsg-lib.c
bsg.c	bsg: fix sysfs link remove warning	2012-02-08 20:02:03 +01:00
cfq-iosched.c	block: Make cfq_target_latency tunable through sysfs.	2012-04-01 14:33:39 -07:00
cfq.h
compat_ioctl.c
deadline-iosched.c
elevator.c	block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions	2012-02-08 09:19:38 +01:00
genhd.c	block: fix buffer overflow when printing partition UUIDs	2012-05-15 08:22:04 +02:00
ioctl.c
Kconfig
Kconfig.iosched
Makefile
noop-iosched.c
partition-generic.c	block: Fix NULL pointer dereference in sd_revalidate_disk	2012-03-02 10:38:33 +01:00
scsi_ioctl.c