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
2012-04-19 19:31:33 +01:00
2012-04-18 13:43:13 -07:00
2012-03-28 10:01:29 -07:00
2012-04-20 09:22:02 -07:00
2012-03-27 00:37:23 +01:00
2012-04-23 14:23:32 +03:00
2012-05-12 11:10:25 +01:00
2012-05-14 13:34:31 -07:00
2012-03-17 12:20:44 -07:00
2012-05-22 16:02:13 -07:00
2012-05-21 17:54:55 -07:00
2012-04-20 20:30:19 -04:00
2012-03-30 17:31:56 -07:00
2012-05-16 22:17:37 -04:00
2012-05-08 20:25:42 +02:00
2012-05-09 12:53:47 +02:00
2012-04-16 15:19:12 -04:00
2012-05-12 19:57:34 -07:00
2012-05-22 16:34:21 -07:00
2012-03-26 20:41:01 +04:00
2012-03-13 11:21:23 +11:00
2012-05-14 18:03:04 +01:00
2012-05-22 15:53:59 -07:00
2012-03-24 10:08:39 -07:00
2012-03-26 11:48:54 -04:00
2012-05-22 15:50:46 -07:00
2012-03-16 10:38:24 -04:00
2012-03-30 16:45:39 -07:00
2012-04-20 14:56:36 -07:00
2012-03-22 09:31:55 -04:00
2012-03-24 10:41:37 -07:00
2012-05-15 20:14:35 -04:00
2012-03-07 17:06:08 +11:00
2012-03-16 10:38:24 -04:00
2012-04-14 11:13:20 +10:00
2012-03-20 21:29:46 -04:00
2012-03-24 10:08:39 -07:00
2012-03-04 17:54:34 -05:00
2012-03-23 16:58:34 -07:00
2012-05-14 08:29:23 +02:00
2012-03-04 17:54:35 -05:00
2012-03-16 10:38:24 -04:00
2012-03-24 10:41:37 -07:00
2012-04-11 09:16:48 -07:00
2012-03-16 20:35:02 +00:00
2012-03-16 20:35:02 +00:00
2012-04-19 19:34:18 +01:00
2012-05-02 09:30:32 +01:00
2012-03-28 18:30:03 +01:00
2012-03-21 17:54:56 -07:00
2012-03-29 18:12:23 -07:00
2012-03-23 16:58:36 -07:00
2012-03-24 10:41:37 -07:00
2012-03-24 10:41:37 -07:00
2012-03-30 03:23:30 -04:00
2012-03-29 15:38:31 +10:30
2012-03-29 14:46:05 -07:00
2012-03-16 10:38:24 -04:00
2012-03-23 16:58:38 -07:00
2012-03-24 10:08:39 -07:00
2012-03-29 19:52:48 +08:00
2012-05-10 19:54:35 -07:00
2012-04-05 05:08:04 -04:00
2012-04-14 15:24:26 -04:00
2012-03-28 15:58:21 -07:00
2012-03-20 21:29:53 -04:00
2012-03-17 21:51:34 +01:00
2012-05-14 12:19:56 -07:00
2012-03-28 16:36:44 +02:00
2012-03-28 15:02:41 -07:00
2012-04-04 17:13:43 -07:00
2012-04-10 15:30:16 -07:00
2012-05-07 14:35:00 +02:00
2012-05-01 08:58:06 -04:00
2012-03-28 14:24:40 -07:00
2012-04-30 15:30:18 -07:00
2012-03-04 17:54:34 -05:00
2012-03-08 11:53:13 -08:00
2012-05-17 15:36:35 -04:00
2012-05-15 13:13:33 -04:00
2012-03-31 16:03:16 -04:00
2012-05-04 16:25:29 -07:00
2012-03-24 10:41:37 -07:00
2012-03-20 21:29:32 -04:00
2012-05-21 20:27:36 -07:00
2012-03-18 22:15:39 +01:00
2012-04-02 14:41:27 -07:00
2012-05-11 16:42:14 +02:00
2012-04-18 13:46:42 -07:00
2012-03-04 17:54:34 -05:00
2012-05-10 15:55:43 -04:00
2012-04-12 12:57:08 +02:00
2012-04-09 11:14:50 -07:00
2012-05-15 08:22:04 +02:00
2012-03-19 17:56:18 -07:00
2012-04-27 10:46:45 +08:00
2012-03-28 14:08:46 -07:00
2012-03-24 10:08:39 -07:00
2012-03-21 17:55:02 -07:00
2012-03-21 17:54:59 -07:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-05-22 16:02:13 -07:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-04-22 11:59:47 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-04 17:54:34 -05:00
2012-03-28 15:58:21 -07:00
2012-04-16 14:19:29 -04:00
2012-05-16 15:17:08 -04:00
2012-03-27 22:45:26 -04:00
2012-04-15 13:06:05 -04:00
2012-04-15 13:06:05 -04:00
2012-03-04 20:41:38 -05:00
2012-04-28 22:21:51 -04:00
2012-05-01 09:30:55 -04:00
2012-04-21 16:26:33 -04:00
2012-03-24 10:08:39 -07:00
2012-05-17 15:49:51 -04:00
2012-03-16 23:00:20 -07:00
2012-03-21 17:54:59 -07:00
2012-03-09 10:56:35 -08:00
2012-04-19 13:56:55 +02:00
2012-03-04 17:54:34 -05:00
2012-05-07 10:58:57 -06:00
2012-05-08 19:38:31 +02:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-05-15 20:14:35 -04:00
2012-04-23 11:04:29 +10:00
2012-04-12 00:37:48 -06:00
2012-04-09 11:16:55 -07:00
2012-03-13 22:45:38 -04:00
2012-03-13 22:45:25 -04:00
2012-03-16 10:38:24 -04:00
2012-03-08 10:50:35 -08:00
2012-05-22 16:34:21 -07:00
2012-04-12 18:35:58 -07:00
2012-03-21 17:54:57 -07:00
2012-03-31 13:34:04 -07:00
2012-05-16 00:54:33 +10:00
2012-03-08 10:50:35 -08:00
2012-05-11 10:56:56 +01:00
2012-03-29 17:41:25 -05:00
2012-04-19 19:17:30 -07:00
2012-03-28 23:30:28 +02:00
2012-03-05 15:49:42 -08:00
2012-03-04 17:54:34 -05:00
2012-04-11 22:55:25 -03:00
2012-03-08 14:11:36 +02:00
2012-05-01 09:30:55 -04:00
2012-03-23 16:58:35 -07:00
2012-03-23 16:58:34 -07:00
2012-04-23 12:11:47 +01:00
2012-03-28 18:30:03 +01:00
2012-05-15 08:08:31 -07:00
2012-03-23 16:58:33 -07:00
2012-03-26 20:40:59 +04:00
2012-04-09 12:23:04 -04:00
2012-03-23 16:58:31 -07:00
2012-03-16 10:38:24 -04:00
2012-03-15 21:41:34 +01:00
2012-05-07 22:58:09 -04:00
2012-05-09 13:58:06 -07:00
2012-03-21 17:55:02 -07:00
2012-03-04 17:54:34 -05:00
2012-03-21 17:54:57 -07:00
2012-05-16 15:24:36 -04:00
2012-05-16 15:23:46 -04:00
2012-05-06 14:05:17 -07:00
2012-03-21 17:54:56 -07:00
2012-03-27 16:30:09 -07:00
2012-03-26 12:50:52 +10:30
2012-04-30 14:05:27 -04:00
2012-03-27 08:26:34 +01:00
2012-04-15 13:06:04 -04:00
2012-05-15 13:45:02 -04:00
2012-05-19 02:51:00 -04:00
2012-04-24 00:16:24 -04:00
2012-04-20 21:22:30 -04:00
2012-05-08 20:25:42 +02:00
2012-04-12 15:10:33 -04:00
2012-03-26 11:48:54 -04:00
2012-03-21 09:31:44 -04:00
2012-03-05 15:26:47 -05:00
2012-03-17 11:09:33 -04:00
2012-04-20 23:14:28 -04:00
2012-03-04 17:54:34 -05:00
2012-05-08 21:53:59 -04:00
2012-05-16 15:17:08 -04:00
2012-03-23 16:58:31 -07:00
2012-03-24 10:41:37 -07:00
2012-05-07 22:58:09 -04:00
2012-03-15 23:28:19 +08:00
2012-03-05 08:09:09 -07:00
2012-04-18 15:07:53 -07:00
2012-05-02 01:14:40 +02:00
2012-03-21 17:54:58 -07:00
2012-03-16 10:38:24 -04:00
2012-03-14 17:25:56 +08:00
2012-03-21 17:55:01 -07:00
2012-03-24 10:08:39 -07:00
2012-03-28 18:30:03 +01:00
2012-03-04 20:54:01 -05:00
2012-04-30 14:52:43 -06:00
2012-05-14 14:15:32 -07:00
2012-03-24 08:46:59 +01:00
2012-05-16 00:59:12 -04:00
2012-03-28 17:14:36 -07:00
2012-04-29 13:12:42 -07:00
2012-05-12 15:53:42 -04:00
2012-03-24 10:41:37 -07:00
2012-03-28 23:31:24 +02:00
2012-03-04 23:08:46 +01:00
2012-03-16 21:49:24 +01:00
2012-03-23 16:58:38 -07:00
2012-03-04 17:54:34 -05:00
2012-03-16 10:38:24 -04:00
2012-03-04 20:41:38 -05:00
2012-03-04 20:41:38 -05:00
2012-03-04 20:41:38 -05:00
2012-04-14 11:13:18 +10:00
2012-05-07 17:03:27 -07:00
2012-05-17 08:51:59 -07:00
2012-04-04 05:28:45 -04:00
2012-04-14 11:13:21 +10:00
2012-03-20 21:29:38 -04:00
2012-03-28 17:14:37 -07:00
2012-04-24 20:54:49 -07:00
2012-05-11 10:14:21 -07:00
2012-05-02 14:48:27 -07:00
2012-05-11 10:14:21 -07:00
2012-05-14 17:40:05 +01:00
2012-03-24 10:08:39 -07:00
2012-03-20 21:29:43 -04:00
2012-03-20 21:29:42 -04:00
2012-03-04 17:54:34 -05:00
2012-03-06 19:14:37 +02:00
2012-04-27 14:36:45 -07:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-03-21 17:54:57 -07:00
2012-05-12 15:15:20 -04:00
2012-03-15 18:23:10 -07:00
2012-04-15 13:06:04 -04:00
2012-03-28 18:30:03 +01:00
2012-03-07 11:32:21 +00:00
2012-03-04 17:54:34 -05:00
2012-05-21 20:27:36 -07:00
2012-04-18 12:24:50 +10:00
2012-05-22 11:21:06 +10:00
2012-03-24 10:08:39 -07:00
2012-05-04 15:13:54 -07:00
2012-05-02 14:14:13 -07:00
2012-04-18 15:57:31 -07:00
2012-03-16 10:38:24 -04:00
2012-03-08 11:38:50 -08:00
2012-03-12 22:19:13 +01:00
2012-05-19 18:34:57 -04:00
2012-03-06 11:01:33 +02:00
2012-03-28 15:04:26 -07:00
2012-05-08 12:35:06 +02:00
2012-03-19 16:53:08 -04:00
2012-04-25 20:46:59 -04:00
2012-04-15 12:44:40 -04:00
2012-03-23 13:18:57 +01:00
2012-03-28 15:58:21 -07:00
2012-04-30 10:48:25 -07:00
2012-04-14 07:47:49 -07:00
2012-05-14 18:53:19 -04:00
2012-03-28 18:30:03 +01:00
2012-04-05 15:25:51 -07:00
2012-03-04 17:54:34 -05:00
2012-03-04 17:54:34 -05:00
2012-05-14 12:19:56 -07:00
2012-03-13 14:06:33 -04:00
2012-05-02 20:56:10 -04:00
2012-05-08 13:55:20 +02:00
2012-05-09 14:19:13 -07:00
2012-03-29 18:12:23 -07:00
2012-03-22 19:43:43 -07:00
2012-05-14 14:15:31 -07:00
2012-03-20 21:29:40 -04:00
2012-03-23 16:58:40 -07:00
2012-03-04 17:54:34 -05:00
2012-03-08 11:38:51 -08:00
2012-05-10 11:24:03 -07:00
2012-05-04 16:58:47 -07:00
2012-04-10 22:39:17 -06:00
2012-05-21 09:00:03 -07:00
2012-05-09 13:57:30 -07:00
2012-04-11 09:36:00 +01:00
2012-03-19 15:33:24 -03:00
2012-05-22 12:16:16 +09:30
2012-03-27 16:30:09 -07:00
2012-04-15 03:23:31 -04:00
2012-03-31 08:09:50 +05:30
2012-04-25 21:26:33 -07:00
2012-04-26 12:34:58 -07:00
2012-04-24 16:14:14 -07:00
2012-03-28 18:30:03 +01:00
2012-03-27 20:15:37 +02:00
2012-03-07 16:08:46 +01:00
88d6ae8dc3