Linus Torvalds b3c9dd182e
Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block ...
* 'for-3.3/core' of git://git.kernel.dk/linux-block: (37 commits)
Revert "block: recursive merge requests"
block: Stop using macro stubs for the bio data integrity calls
blockdev: convert some macros to static inlines
fs: remove unneeded plug in mpage_readpages()
block: Add BLKROTATIONAL ioctl
block: Introduce blk_set_stacking_limits function
block: remove WARN_ON_ONCE() in exit_io_context()
block: an exiting task should be allowed to create io_context
block: ioc_cgroup_changed() needs to be exported
block: recursive merge requests
block, cfq: fix empty queue crash caused by request merge
block, cfq: move icq creation and rq->elv.icq association to block core
block, cfq: restructure io_cq creation path for io_context interface cleanup
block, cfq: move io_cq exit/release to blk-ioc.c
block, cfq: move icq cache management to block core
block, cfq: move io_cq lookup to blk-ioc.c
block, cfq: move cfqd->icq_list to request_queue and add request->elv.icq
block, cfq: reorganize cfq_io_context into generic and cfq specific parts
block: remove elevator_queue->ops
block: reorder elevator switch sequence
...
Fix up conflicts in:
- block/blk-cgroup.c
Switch from can_attach_task to can_attach
- block/cfq-iosched.c
conflict with now removed cic index changes (we now use q->id instead)
2012-01-15 12:24:45 -08:00
2012-01-14 13:25:23 -08:00
2011-12-13 15:31:27 -05:00
2011-12-01 13:09:31 -05:00
2011-11-11 09:50:19 -08:00
2012-01-09 00:37:40 +01:00
2011-12-30 15:25:52 -08:00
2012-01-13 09:32:20 +10:30
2012-01-13 20:43:32 -08:00
2011-12-19 14:57:07 -05:00
2012-01-14 12:32:16 -08:00
2012-01-09 18:26:26 +00:00
2012-01-09 13:08:28 -08:00
2011-12-27 20:31:38 +01:00
2012-01-03 09:10:09 +01:00
2012-01-09 14:21:03 -08:00
2012-01-06 05:22:21 +04:00
2011-12-23 10:17:51 +11:00
2012-01-03 20:20:01 +00:00
2011-11-17 12:15:39 -08:00
2011-12-13 15:30:49 -05:00
2012-01-14 12:26:41 -08:00
2012-01-04 15:52:42 -08:00
2011-12-13 15:07:49 +00:00
2011-12-05 10:21:48 -08:00
2012-01-08 19:14:59 -05:00
2011-11-02 16:07:03 -07:00
2011-12-15 11:15:39 +01:00
2011-12-13 18:46:56 -05:00
2011-11-26 16:40:30 -05:00
2012-01-03 22:55:17 -05:00
2012-01-13 08:15:33 +01:00
2011-12-06 08:33:54 +01:00
2012-01-15 12:24:45 -08:00
2012-01-14 18:36:33 -08:00
2011-11-22 15:22:23 -05:00
2012-01-09 12:59:24 -08:00
2011-12-28 21:25:35 +08:00
2011-12-19 11:41:40 +01:00
2012-01-03 22:55:19 -05:00
2012-01-10 16:30:42 -08:00
2011-12-21 07:14:34 -05:00
2012-01-10 16:30:42 -08:00
2012-01-03 22:54:57 -05:00
2012-01-13 09:32:20 +10:30
2012-01-07 12:03:30 -08:00
2011-12-08 13:57:20 +11:00
2012-01-12 20:13:11 -08:00
2012-01-05 18:52:59 -05:00
2011-11-06 19:44:47 -08:00
2011-12-13 09:26:45 +00:00
2012-01-13 10:29:21 -08:00
2012-01-08 12:19:57 -08:00
2011-11-23 18:49:22 +01:00
2011-11-07 23:54:53 +01:00
2012-01-08 12:19:57 -08:00
2011-11-09 12:10:37 +02:00
2012-01-04 08:56:31 -06:00
2011-12-16 08:49:57 -08:00
2012-01-06 10:20:21 +00:00
2011-11-06 17:12:03 -08:00
2011-11-06 19:44:47 -08:00
2011-11-29 12:46:19 -05:00
2011-12-14 15:21:07 -08:00
2011-11-26 14:59:39 -05:00
2011-12-09 17:35:51 -08:00
2011-12-14 00:33:42 +01:00
2011-12-12 13:54:36 +00:00
2011-12-11 18:25:16 -05:00
2012-01-04 14:10:28 -05:00
2012-01-12 20:13:04 -08:00
2012-01-03 22:54:58 -05:00
2011-12-19 20:07:13 +00:00
2011-12-27 01:06:33 +01:00
2012-01-15 12:24:45 -08:00
2011-12-05 13:28:45 -05:00
2012-01-07 17:26:49 -05:00
2011-12-13 11:58:49 +01:00
2011-11-06 19:44:47 -08:00
2011-12-03 09:35:08 -08:00
2012-01-03 22:54:55 -05:00
2012-01-10 16:30:43 -08:00
2012-01-11 09:23:05 +00:00
2011-11-15 19:08:27 +08:00
2011-12-11 10:31:24 -08:00
2012-01-09 11:24:59 +01:00
2012-01-12 20:13:08 -08:00
2011-11-19 06:15:59 -05:00
2011-11-08 09:28:27 +02:00
2012-01-04 16:13:05 -08:00
2012-01-06 11:42:52 -08:00
2012-01-03 22:54:56 -05:00
2011-12-13 15:30:40 -05:00
2011-12-05 18:27:56 -05:00
2011-11-16 18:16:38 -05:00
2011-12-08 19:52:42 -05:00
2011-11-13 16:10:10 -05:00
2012-01-11 12:56:06 -08:00
2012-01-09 12:59:24 -08:00
2012-01-13 09:32:18 +10:30
2011-12-14 00:33:42 +01:00
2012-01-09 13:06:28 +01:00
2012-01-03 22:55:17 -05:00
2011-12-11 18:25:16 -05:00
2011-12-23 22:33:58 +00:00
2012-01-03 22:54:55 -05:00
2011-12-13 09:26:45 +00:00
2011-12-28 17:46:46 -05:00
2012-01-09 13:52:09 +01:00
2011-12-06 20:41:03 +01:00
2011-12-30 16:42:19 -05:00
2011-12-06 09:06:38 +01:00
2012-01-12 20:13:03 -08:00
2011-10-31 17:46:07 -07:00
2011-11-17 09:35:32 +11:00
2011-12-02 16:12:42 +00:00
2011-12-09 23:36:36 +01:00
2012-01-12 20:13:11 -08:00
2011-12-21 15:13:54 -08:00
2011-12-14 11:19:07 -08:00
2011-11-21 12:32:23 -08:00
2011-12-27 11:24:29 +02:00
2011-12-27 11:26:41 +02:00
2011-12-26 13:27:44 +02:00
2011-11-17 12:20:19 +01:00
2012-01-10 16:30:49 -08:00
2011-12-22 02:02:20 -05:00
2012-01-12 20:13:03 -08:00
2011-11-14 13:35:16 +01:00
2011-12-12 22:06:55 -08:00
2011-11-04 17:22:14 -07:00
2012-01-04 16:25:45 +04:00
2011-11-02 16:06:59 -07:00
2011-12-13 18:46:55 -05:00
2011-11-15 16:56:17 -05:00
2011-11-15 16:56:17 -05:00
2011-12-08 10:22:09 -08:00
2012-01-12 20:13:07 -08:00
2011-12-21 14:48:43 -08:00
2012-01-10 16:30:45 -08:00
2012-01-12 20:13:09 -08:00
2011-11-21 15:27:19 -05:00
2012-01-03 22:55:15 -05:00
2012-01-12 20:13:10 -08:00
2012-01-12 20:13:03 -08:00
2012-01-11 19:12:10 -08:00
2012-01-12 20:13:10 -08:00
2012-01-03 22:57:13 -05:00
2012-01-13 20:43:32 -08:00
2012-01-13 09:32:14 +10:30
2012-01-13 09:32:28 +10:30
2012-01-03 22:57:12 -05:00
2011-11-09 11:45:26 +02:00
2011-12-13 15:07:49 +00:00
2012-01-06 12:10:25 -08:00
2011-11-02 12:53:42 +01:00
2011-11-14 00:47:54 -05:00
2011-11-16 17:43:12 -05:00
2012-01-09 14:46:52 -08:00
2011-11-21 16:38:08 -05:00
2011-12-06 13:57:36 -05:00
2012-01-04 14:30:43 -05:00
2012-01-05 11:59:18 -05:00
2012-01-03 22:52:34 -05:00
2012-01-07 13:22:46 -05:00
2012-01-07 13:22:46 -05:00
2011-12-19 14:34:13 -05:00
2011-11-18 10:51:01 -08:00
2011-12-21 14:48:43 -08:00
2011-12-27 10:57:13 -06:00
2011-12-12 13:40:16 -07:00
2012-01-07 12:18:52 -08:00
2012-01-12 20:13:06 -08:00
2011-12-03 09:35:17 -08:00
2011-11-04 22:28:13 +01:00
2012-01-12 20:13:07 -08:00
2012-01-10 16:30:42 -08:00
2012-01-12 20:13:10 -08:00
2011-12-13 15:07:49 +00:00
2012-01-06 12:11:40 -08:00
2012-01-11 18:50:26 -08:00
2012-01-06 12:10:26 -08:00
2012-01-06 12:15:21 -08:00
2011-12-22 10:40:20 -08:00
2011-12-21 10:26:37 +01:00
2011-11-18 14:37:40 -05:00
2012-01-12 15:23:04 -08:00
2012-01-10 16:30:54 -08:00
2012-01-12 20:05:28 -08:00
2012-01-08 13:10:57 -08:00
2011-12-09 23:22:41 +01:00
2011-12-25 23:43:11 +01:00
2011-12-01 21:46:42 +01:00
2011-12-25 23:43:05 +01:00
2011-12-13 09:26:45 +00:00
2011-12-08 10:22:07 -08:00
2012-01-04 09:09:35 +04:00
2011-11-02 16:07:02 -07:00
2012-01-12 20:13:13 -08:00
2012-01-10 16:30:54 -08:00
2011-11-17 13:13:29 -08:00
2012-01-05 18:53:00 -05:00
2012-01-12 20:13:12 -08:00
2012-01-03 22:55:07 -05:00
2011-12-11 10:32:06 -08:00
2011-12-13 00:12:48 +08:00
2012-01-06 23:20:13 -05:00
2012-01-06 23:20:13 -05:00
2012-01-03 22:54:56 -05:00
2011-11-02 16:07:01 -07:00
2012-01-12 20:13:06 -08:00
2012-01-06 06:13:35 +04:00
2012-01-12 20:13:03 -08:00
2012-01-14 18:36:33 -08:00
2011-11-02 16:07:01 -07:00
2012-01-03 22:52:40 -05:00
2011-12-09 19:14:13 -08:00
2012-01-14 13:05:21 -08:00
2011-12-02 20:09:48 +09:00
2011-11-15 12:13:44 -08:00
2011-12-09 18:01:05 +09:00
2011-12-25 23:39:11 +01:00
2012-01-09 09:33:57 +09:00
2012-01-03 22:55:07 -05:00
2011-12-09 07:50:27 -08:00
2012-01-10 16:30:54 -08:00
2012-01-05 14:01:21 -05:00
2012-01-09 14:19:33 -08:00
2012-01-03 20:23:18 -05:00
2011-12-30 16:42:19 -05:00
2011-12-13 09:26:45 +00:00
2011-12-13 15:07:49 +00:00
2011-12-11 10:32:06 -08:00
2011-12-08 23:22:21 +01:00
2012-01-10 16:30:43 -08:00
2011-12-06 10:38:03 +00:00
2012-01-03 22:55:19 -05:00
2012-01-03 22:55:12 -05:00
2012-01-03 22:54:56 -05:00
2011-12-21 01:03:23 -05:00
2011-12-11 10:31:57 -08:00
2012-01-08 13:21:22 -08:00
2012-01-04 22:19:55 -08:00
2011-12-30 16:46:02 -05:00
2012-01-09 12:09:47 -08:00
2011-11-02 16:07:02 -07:00
2011-12-19 20:07:13 +00:00
2011-12-02 13:49:21 -05:00
2011-11-24 13:04:47 +10:30
2012-01-12 15:44:42 +10:30
2012-01-12 15:44:44 +10:30
2011-12-05 23:27:59 +00:00
2011-12-21 10:07:39 +01:00
2011-12-02 14:57:31 +01:00
2012-01-06 15:22:04 +01:00
2012-01-10 16:30:54 -08:00
2012-01-10 16:59:59 -08:00
2011-11-11 16:55:54 +00:00
b3c9dd182e