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