Tejun Heo 959d851caa Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged
cgroup/for-3.5 contains the following changes which blk-cgroup needs
to proceed with the on-going cleanup.

* Dynamic addition and removal of cftypes to make config/stat file
  handling modular for policies.

* cgroup removal update to not wait for css references to drain to fix
  blkcg removal hang caused by cfq caching cfqgs.

Pull in cgroup/for-3.5 into block/for-3.5/core.  This causes the
following conflicts in block/blk-cgroup.c.

* 761b3ef50e "cgroup: remove cgroup_subsys argument from callbacks"
  conflicts with blkiocg_pre_destroy() addition and blkiocg_attach()
  removal.  Resolved by removing @subsys from all subsys methods.

* 676f7c8f84 "cgroup: relocate cftype and cgroup_subsys definitions in
  controllers" conflicts with ->pre_destroy() and ->attach() updates
  and removal of modular config.  Resolved by dropping forward
  declarations of the methods and applying updates to the relocated
  blkio_subsys.

* 4baf6e3325 "cgroup: convert all non-memcg controllers to the new
  cftype interface" builds upon the previous item.  Resolved by adding
  ->base_cftypes to the relocated blkio_subsys.

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