Linus Torvalds 0d167518e0
Merge branch 'for-3.5/core' of git://git.kernel.dk/linux-block ...
Merge block/IO core bits from Jens Axboe:
"This is a bit bigger on the core side than usual, but that is purely
because we decided to hold off on parts of Tejun's submission on 3.4
to give it a bit more time to simmer. As a consequence, it's seen a
long cycle in for-next.
It contains:
- Bug fix from Dan, wrong locking type.
- Relax splice gifting restriction from Eric.
- A ton of updates from Tejun, primarily for blkcg. This improves
the code a lot, making the API nicer and cleaner, and also includes
fixes for how we handle and tie policies and re-activate on
switches. The changes also include generic bug fixes.
- A simple fix from Vivek, along with a fix for doing proper delayed
allocation of the blkcg stats."
Fix up annoying conflict just due to different merge resolution in
Documentation/feature-removal-schedule.txt
* 'for-3.5/core' of git://git.kernel.dk/linux-block: (92 commits)
blkcg: tg_stats_alloc_lock is an irq lock
vmsplice: relax alignement requirements for SPLICE_F_GIFT
blkcg: use radix tree to index blkgs from blkcg
blkcg: fix blkcg->css ref leak in __blkg_lookup_create()
block: fix elvpriv allocation failure handling
block: collapse blk_alloc_request() into get_request()
blkcg: collapse blkcg_policy_ops into blkcg_policy
blkcg: embed struct blkg_policy_data in policy specific data
blkcg: mass rename of blkcg API
blkcg: style cleanups for blk-cgroup.h
blkcg: remove blkio_group->path[]
blkcg: blkg_rwstat_read() was missing inline
blkcg: shoot down blkgs if all policies are deactivated
blkcg: drop stuff unused after per-queue policy activation update
blkcg: implement per-queue policy activation
blkcg: add request_queue->root_blkg
blkcg: make request_queue bypassing on allocation
blkcg: make sure blkg_lookup() returns %NULL if @q is bypassing
blkcg: make blkg_conf_prep() take @pol and return with queue lock held
blkcg: remove static policy ID enums
...
2012-05-30 08:52:42 -07:00
2012-05-25 09:31:59 -07:00
2012-05-24 11:54:29 -07:00
2010-08-14 22:26:51 +02:00
2011-08-26 12:02:50 -04:00
2012-02-03 01:21:25 +01:00
2012-03-28 10:01:29 -07:00
2011-03-31 11:26:23 -03:00
2012-05-20 10:06:08 -03:00
2012-04-20 09:22:02 -07:00
2012-05-12 13:32:17 +08:00
2012-04-23 14:23:32 +03:00
2012-05-24 10:34:29 -07:00
2012-05-14 13:34:31 -07:00
2012-05-10 22:39:43 -07:00
2012-02-15 00:19:48 -05:00
2012-05-29 11:53:11 -07:00
2012-05-21 17:54:55 -07:00
2012-05-26 12:57:47 -07:00
2012-05-21 11:34:41 +03: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-05-15 17:30:30 -04:00
2012-04-16 15:19:12 -04:00
2012-05-12 19:57:34 -07:00
2012-05-23 14:15:09 -07:00
2012-05-22 13:54:18 +10:00
2012-05-14 18:03:04 +01:00
2012-05-29 16:22:33 -07:00
2012-05-26 12:42:29 -07:00
2012-05-16 12:45:22 -04:00
2012-03-26 11:48:54 -04:00
2012-05-22 15:50:46 -07:00
2008-02-06 10:41:02 -08:00
2012-04-20 14:56:36 -07:00
2012-02-09 09:04:23 -08:00
2012-05-29 16:22:29 -07:00
2011-06-06 22:55:11 -07:00
2005-06-21 19:07:41 -07:00
2009-09-08 17:42:50 -07:00
2009-02-08 09:56:11 -08:00
2011-12-13 18:46:56 -05: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
2009-04-01 08:59:23 -07:00
2009-01-08 08:31:12 -08:00
2010-12-06 15:58:43 -05:00
2011-10-31 00:33:36 +08:00
2011-03-22 17:43:59 -07:00
2012-05-19 12:17:35 -06:00
2008-10-20 08:52:42 -07:00
2012-03-04 17:54:34 -05:00
2011-08-03 11:30:42 -04:00
2012-03-23 16:58:34 -07:00
2012-05-30 08:52:42 -07:00
2011-10-31 17:30:54 -07:00
2012-05-29 16:22:22 -07:00
2005-04-16 15:20:36 -07:00
2011-07-26 16:49:47 -07:00
2012-05-29 16:22:20 -07:00
2010-03-03 11:25:58 +01:00
2012-05-23 17:42:39 -07:00
2011-01-13 08:03:17 -08:00
2011-03-31 11:26:23 -03:00
2012-03-24 10:41:37 -07:00
2012-04-11 09:16:48 -07:00
2012-05-08 14:13:25 -07:00
2012-05-15 12:02:39 -07:00
2012-05-11 17:13:00 +02:00
2012-05-02 09:30:32 +01:00
2011-09-08 11:10:56 +02:00
2012-02-01 18:37:39 -08:00
2010-10-25 08:02:40 -07:00
2012-05-29 16:22:22 -07:00
2007-10-17 08:42:47 -07:00
2012-02-28 16:02:54 +01:00
2011-01-05 14:15:50 +01:00
2005-04-16 15:20:36 -07:00
2008-04-30 08:29:54 -07:00
2012-01-13 09:32:20 +10:30
2008-06-04 14:56:12 +01:00
2008-01-30 13:32:42 +01:00
2011-09-23 12:05:29 +05:30
2011-01-24 14:51:56 -08:00
2012-05-17 13:48:56 +02:00
2012-05-03 03:29:33 -07:00
2012-03-24 10:08:39 -07:00
2012-05-07 15:02:26 +02:00
2009-09-10 10:00:05 -07:00
2012-05-10 19:54:35 -07:00
2012-04-14 15:24:26 -04:00
2012-03-28 15:58:21 -07:00
2012-04-17 00:18:36 -04:00
2011-11-23 18:49:22 +01:00
2010-08-04 11:00:45 +02:00
2012-03-17 21:51:34 +01:00
2011-10-31 20:19:04 +00:00
2012-05-25 09:18:59 -07:00
2008-10-13 09:51:43 -07:00
2012-05-02 14:15:27 -05:00
2012-05-25 12:46:23 +05:30
2012-05-21 15:09:37 +02:00
2009-04-15 12:22:37 +02:00
2012-05-25 09:31:59 -07:00
2007-02-09 17:39:36 -05:00
2012-05-07 14:35:00 +02:00
2009-11-04 09:50:58 -08:00
2010-07-28 09:59:01 -04:00
2011-06-30 09:23:45 +02:00
2011-05-24 10:21:29 +02:00
2012-05-01 08:58:06 -04:00
2011-11-29 12:46:19 -05:00
2011-06-27 09:11:02 -04:00
2012-05-28 19:13:50 -03:00
2009-01-30 23:46:40 +05:30
2012-04-30 15:30:18 -07:00
2011-12-12 13:54:36 +00:00
2012-03-04 17:54:34 -05:00
2008-01-28 23:21:18 +01:00
2011-03-22 17:44:11 -07: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-05-05 21:50:41 +02:00
2011-10-31 09:20:11 -04:00
2011-03-31 11:26:23 -03:00
2012-05-04 16:25:29 -07:00
2011-01-12 20:16:43 -05:00
2012-05-29 16:22:28 -07:00
2005-04-16 15:20:36 -07:00
2011-07-07 08:18:18 +02:00
2012-02-19 10:30:57 -08:00
2011-01-09 15:42:55 -08:00
2012-03-20 21:29:32 -04:00
2012-05-21 20:27:36 -07:00
2009-06-18 19:50:21 +08:00
2012-03-18 22:15:39 +01:00
2012-05-24 12:57:47 -07:00
2011-01-10 08:51:44 -08:00
2011-10-31 19:32:32 -04:00
2012-05-14 09:47:23 -03:00
2005-04-16 15:20:36 -07:00
2011-05-26 17:12:33 -07:00
2009-12-17 10:58:17 -05:00
2011-01-07 17:50:27 +11:00
2012-05-29 16:22:23 -07:00
2012-04-18 13:46:42 -07:00
2011-07-08 00:21:27 -05:00
2012-05-10 15:55:43 -04:00
2012-05-16 20:00:27 -04:00
2012-04-12 12:57:08 +02:00
2009-06-18 13:04:05 -07:00
2011-08-03 11:15:57 -04:00
2012-04-09 11:14:50 -07:00
2012-05-15 08:22:04 +02:00
2012-05-21 15:09:33 +02:00
2012-04-27 10:46:45 +08:00
2012-05-18 16:48:35 -06:00
2011-08-17 13:00:20 -07:00
2009-06-26 10:48:34 +02:00
2012-05-22 11:32:31 +02:00
2012-04-30 10:39:17 +02:00
2011-06-27 16:06:19 -07:00
2012-05-29 16:22:21 -07:00
2012-05-25 12:48:26 -04:00
2012-05-22 16:02:13 -07:00
2012-03-26 21:47:19 +02:00
2012-05-12 14:28:18 +02:00
2012-05-12 14:28:15 +02:00
2012-05-12 14:28:14 +02:00
2012-05-12 14:28:16 +02:00
2012-05-17 19:06:13 -04:00
2012-03-28 15:58:21 -07:00
2012-04-16 14:19:29 -04:00
2012-05-22 17:13:11 -04:00
2011-12-05 18:27:56 -05:00
2012-04-15 13:06:05 -04:00
2012-04-15 13:06:05 -04: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
2011-07-18 12:29:38 -04:00
2012-05-17 15:49:51 -04:00
2008-07-09 12:09:28 -04:00
2012-03-16 23:00:20 -07:00
2012-03-21 17:54:59 -07:00
2012-01-13 09:32:18 +10:30
2005-04-16 15:20:36 -07:00
2011-01-31 21:17:41 -08:00
2012-03-09 10:56:35 -08:00
2012-04-19 13:56:55 +02:00
2012-03-20 12:47:48 +01:00
2005-04-16 15:20:36 -07:00
2012-05-22 18:08:08 +02:00
2012-05-07 10:58:57 -06:00
2012-05-08 19:38:31 +02:00
2007-04-25 22:25:31 -07:00
2012-01-03 22:55:17 -05:00
2009-04-21 13:41:48 -07:00
2012-03-16 10:38:24 -04:00
2012-05-23 13:49:23 -04:00
2012-05-21 21:09:38 +02:00
2012-05-19 12:41:56 -06:00
2012-04-09 11:16:55 -07:00
2012-05-15 23:34:37 +02:00
2012-05-29 16:22:32 -07:00
2012-05-29 16:22:21 -07:00
2012-04-12 18:35:58 -07:00
2007-04-04 21:12:47 -07:00
2011-12-06 09:06:38 +01:00
2012-05-29 16:22:21 -07:00
2012-05-24 15:10:28 -07:00
2010-02-16 16:01:21 -08:00
2012-05-16 00:54:33 +10:00
2012-05-11 10:56:56 +01:00
2012-04-19 19:17:30 -07:00
2007-05-17 05:23:04 -07:00
2012-03-28 23:30:28 +02:00
2010-03-15 15:29:39 +01:00
2011-12-21 15:13:54 -08:00
2012-01-17 15:40:51 -08:00
2011-11-21 12:32:23 -08:00
2012-05-16 16:08:28 -03:00
2012-05-17 21:06:01 -03:00
2012-05-01 09:30:55 -04:00
2011-09-16 19:20:20 -04:00
2012-05-29 16:22:29 -07:00
2012-05-29 16:22:32 -07:00
2012-05-29 16:22:31 -07:00
2012-05-07 15:32:23 -04:00
2007-07-17 10:23:03 -07:00
2009-06-16 19:47:57 -07:00
2012-05-15 08:08:31 -07:00
2011-12-12 22:06:55 -08:00
2011-11-04 17:22:14 -07:00
2011-05-24 10:01:37 +02:00
2012-04-09 12:23:04 -04:00
2012-03-23 16:58:31 -07:00
2008-12-29 04:59:31 -08:00
2012-03-16 10:38:24 -04:00
2012-05-07 22:58:09 -04:00
2012-05-09 13:58:06 -07:00
2012-05-29 16:22:28 -07:00
2012-03-04 17:54:34 -05:00
2012-05-29 16:22:20 -07:00
2012-05-22 15:20:28 -04:00
2012-03-21 17:54:57 -07:00
2012-01-13 10:12:23 -08:00
2012-05-16 15:24:36 -04:00
2012-05-16 15:23:46 -04:00
2012-05-29 16:22:28 -07:00
2012-05-29 16:22:19 -07:00
2012-05-29 16:22:24 -07:00
2012-05-29 16:22:20 -07:00
2005-04-16 15:20:36 -07:00
2012-05-29 16:22:26 -07:00
2012-05-01 12:54:54 +02:00
2012-03-26 12:50:52 +10:30
2011-07-24 22:06:04 +09:30
2012-04-30 14:05:27 -04:00
2012-01-03 22:57:12 -05:00
2009-04-01 07:38:54 -04:00
2012-02-02 00:23:14 +11:00
2006-11-30 04:40:22 +01:00
2008-06-06 11:29:12 -07:00
2012-03-27 08:26:34 +01:00
2008-02-13 16:21:18 -08:00
2012-05-08 16:33:56 -07:00
2012-04-15 13:06:04 -04:00
2012-05-15 13:45:02 -04:00
2012-02-24 01:42:07 -08: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
2011-07-03 20:02:07 -07:00
2012-04-12 15:10:33 -04:00
2012-05-26 14:17:30 -04:00
2012-05-22 16:45:48 -04:00
2012-05-24 16:15:48 -04:00
2012-05-09 15:17:43 -04:00
2012-05-26 14:17:31 -04:00
2012-05-16 13:08:15 -04:00
2012-05-16 15:17:08 -04:00
2011-12-21 14:48:43 -08:00
2011-07-25 20:57:15 -07:00
2012-03-24 10:41:37 -07:00
2012-05-18 16:48:36 -06:00
2012-05-12 14:28:17 +02:00
2012-04-17 16:37:22 -06:00
2012-05-07 22:58:09 -04:00
2012-05-21 14:31:48 +01: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-05-29 16:22:24 -07:00
2011-12-03 09:35:17 -08:00
2012-03-14 17:25:56 +08:00
2012-01-10 16:30:42 -08:00
2012-05-21 15:09:33 +02:00
2012-05-29 16:22:18 -07:00
2012-01-12 20:13:10 -08:00
2005-04-16 15:20:36 -07:00
2008-10-13 10:10:37 -07:00
2011-12-13 15:07:49 +00:00
2011-01-16 13:47:07 -05:00
2011-10-31 19:32:32 -04:00
2012-05-09 15:57:01 +02:00
2012-05-29 18:27:19 -07:00
2012-05-14 14:15:32 -07:00
2012-05-23 17:40:51 +02:00
2005-04-16 15:20:36 -07:00
2009-01-15 16:39:41 -08:00
2008-01-23 19:33:58 -06:00
2012-05-16 00:59:12 -04:00
2012-05-15 14:59:28 -07:00
2011-05-26 17:12:37 -07:00
2012-04-29 13:12:42 -07:00
2012-05-12 15:53:42 -04:00
2012-01-08 13:10:57 -08:00
2011-08-25 15:34:19 +02:00
2012-05-18 20:45:26 +02:00
2012-05-01 21:28:38 +02:00
2012-05-01 21:25:49 +02:00
2012-05-01 21:28:38 +02:00
2012-03-04 20:41:38 -05:00
2011-01-13 08:03:21 -08:00
2011-01-13 08:03:21 -08:00
2012-04-14 11:13:18 +10:00
2012-03-01 10:28:04 +01:00
2011-03-31 11:26:23 -03:00
2012-05-07 17:03:27 -07:00
2012-05-15 14:59:28 -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
2008-09-02 19:21:38 -07:00
2012-05-03 03:29:34 -07:00
2010-02-08 18:19:41 -06:00
2011-10-28 05:29:07 -07:00
2010-02-10 17:47:17 -08:00
2012-05-17 15:18:37 +02: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-05-29 16:22:27 -07:00
2010-11-12 07:55:30 -08:00
2012-03-16 10:38:24 -04:00
2012-04-23 21:17:51 -04:00
2012-05-29 16:22:21 -07:00
2012-05-12 15:15:20 -04:00
2012-02-08 22:53:58 +02:00
2007-05-02 11:56:33 +01:00
2012-05-29 16:22:33 -07:00
2012-04-15 13:06:04 -04:00
2012-05-24 11:39:34 -07:00
2012-04-18 12:24:50 +10:00
2009-10-30 08:27:25 +11:00
2012-05-22 11:21:06 +10:00
2010-10-22 10:20:06 -07:00
2011-11-02 16:07:01 -07:00
2012-03-24 10:08:39 -07:00
2012-05-04 15:13:54 -07:00
2008-02-07 08:42:34 -08:00
2012-05-23 17:12:06 -07:00
2012-04-18 15:57:31 -07:00
2012-04-09 17:39:34 +09:00
2012-05-17 19:02:14 -04:00
2012-04-11 12:05:50 +09:00
2012-05-22 19:07:55 +09:00
2010-10-31 10:40:39 -04:00
2012-05-15 14:59:29 -07:00
2011-12-09 07:50:27 -08:00
2012-05-21 23:52:30 -04:00
2012-05-19 18:34:57 -04:00
2012-05-08 12:35:06 +02:00
2012-04-25 20:46:59 -04:00
2012-04-15 12:44:40 -04:00
2005-04-16 15:20:36 -07:00
2009-12-14 23:55:33 +01:00
2012-03-28 15:58:21 -07:00
2012-04-30 10:48:25 -07:00
2008-05-26 16:15:32 +02:00
2011-06-14 22:48:51 -04:00
2012-05-15 14:08:35 -07:00
2010-08-09 16:48:44 -04:00
2012-04-14 07:47:49 -07:00
2012-05-14 18:53:19 -04:00
2012-04-20 23:27:08 +02:00
2012-03-28 18:30:03 +01:00
2008-10-03 11:46:14 -05:00
2011-10-31 17:30:47 -07:00
2012-02-10 10:44:35 -08:00
2012-05-01 21:25:49 +02:00
2012-05-29 16:22:28 -07:00
2005-04-16 15:20:36 -07:00
2012-03-04 17:54:34 -05:00
2011-03-15 00:43:46 +01:00
2012-01-24 16:40:30 -08:00
2012-05-14 12:19:56 -07:00
2012-02-20 12:48:47 -08:00
2010-02-04 14:20:41 +11:00
2010-03-30 22:02:32 +09:00
2010-12-22 19:43:34 -08:00
2012-03-13 14:06:33 -04:00
2012-05-22 19:22:50 -07:00
2008-10-13 09:51:40 -07:00
2012-05-08 13:55:20 +02:00
2010-05-27 09:12:51 -07:00
2012-05-09 14:19:13 -07:00
2012-05-21 16:16:58 -07:00
2010-10-22 14:46:25 +02:00
2011-05-23 13:59:53 +02:00
2011-04-26 14:01:42 -07:00
2011-05-10 16:03:56 -04:00
2012-05-22 18:27:32 -07:00
2010-11-29 08:55:25 +11:00
2011-09-19 11:35:58 -04:00
2012-03-20 21:29:40 -04:00
2012-03-23 16:58:40 -07: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-04-26 02:01:39 -07:00
2011-10-12 21:13:11 -07:00
2012-04-14 13:25:48 +02:00
2012-05-21 09:00:03 -07:00
2012-05-03 03:28:39 -07:00
2009-11-29 22:03:04 +01:00
2005-04-16 15:20:36 -07:00
2011-06-15 20:04:00 -07:00
2012-05-09 13:57:30 -07:00
2012-05-20 08:27:44 -03:00
2012-04-10 15:00:41 -03:00
2012-05-13 11:27:21 +02:00
2012-05-03 09:30:55 +01:00
2012-05-20 08:31:52 -03:00
2012-05-22 12:16:16 +09:30
2012-04-15 03:23:31 -04:00
2012-03-31 08:09:50 +05:30
2012-04-25 21:26:33 -07:00
2011-12-05 23:27:59 +00:00
2012-04-26 12:34:58 -07:00
2011-07-26 16:49:47 -07:00
2006-04-26 12:56:16 +01:00
2012-04-24 16:14:14 -07:00
2012-03-28 18:30:03 +01:00
2010-10-13 15:45:21 -04:00
2012-05-06 13:43:41 +08:00
2011-03-22 17:44:17 -07:00
0d167518e0