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
..
apparmor	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next	2012-05-22 11:21:06 +10:00
integrity	ima: fix filename hint to reflect script interpreter name	2012-05-16 10:36:41 +10:00
keys	KEYS: Don't check for NULL key pointer in key_validate()	2012-05-16 00:54:33 +10:00
selinux	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-05-21 20:27:36 -07:00
smack	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next	2012-05-22 11:21:06 +10:00
tomoyo	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next	2012-05-22 11:21:06 +10:00
yama	Yama: replace capable() with ns_capable()	2012-05-15 10:27:57 +10:00
capability.c	SELinux: rename dentry_open to file_open	2012-04-09 12:22:50 -04:00
commoncap.c	Linux 3.4-rc5	2012-05-04 12:46:40 +10:00
device_cgroup.c	cgroup: convert all non-memcg controllers to the new cftype interface	2012-04-01 12:09:55 -07:00
inode.c
Kconfig	KEYS: Move the key config into security/keys/Kconfig	2012-05-11 10:56:56 +01:00
lsm_audit.c	LSM: BUILD_BUG_ON if the common_audit_data union ever grows	2012-04-09 12:23:03 -04:00
Makefile	security: Yama LSM	2012-02-10 09:18:52 +11:00
min_addr.c
security.c	SELinux: rename dentry_open to file_open	2012-04-09 12:22:50 -04:00