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
..
persistent-data	device-mapper: using EXPORT_SYBOL in dm-space-map-checker.c needs export.h	2011-11-07 10:29:10 -08:00
bitmap.c	md/bitmap: be more consistent when setting new bits in memory bitmap.	2011-12-23 10:17:51 +11:00
bitmap.h	md: remove typedefs: mddev_t -> struct mddev	2011-10-11 16:47:53 +11:00
dm-bio-record.h
dm-bufio.c	device-mapper: dm-bufio.c needs to include module.h	2011-11-07 10:29:10 -08:00
dm-bufio.h	dm: add bufio	2011-10-31 20:19:09 +00:00
dm-crypt.c	dm crypt: always disable discard_zeroes_data	2011-09-25 23:26:21 +01:00
dm-delay.c
dm-exception-store.c	md: Add module.h to all files using it implicitly	2011-10-31 19:31:18 -04:00
dm-exception-store.h
dm-flakey.c	dm: do not forward ioctls from logical volumes to the underlying device	2012-01-14 15:07:24 -08:00
dm-io.c
dm-ioctl.c	dm table: add immutable feature	2011-10-31 20:19:04 +00:00
dm-kcopyd.c	dm kcopyd: add dm_kcopyd_zero to zero an area	2011-10-31 20:18:58 +00:00
dm-linear.c	dm: do not forward ioctls from logical volumes to the underlying device	2012-01-14 15:07:24 -08:00
dm-log-userspace-base.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
dm-log-userspace-transfer.c
dm-log-userspace-transfer.h
dm-log.c
dm-mpath.c	dm: do not forward ioctls from logical volumes to the underlying device	2012-01-14 15:07:24 -08:00
dm-mpath.h
dm-path-selector.c	md: Add module.h to all files using it implicitly	2011-10-31 19:31:18 -04:00
dm-path-selector.h
dm-queue-length.c
dm-raid1.c
dm-raid.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
dm-region-hash.c
dm-round-robin.c	md: Add module.h to all files using it implicitly	2011-10-31 19:31:18 -04:00
dm-service-time.c	md: Add module.h to all files using it implicitly	2011-10-31 19:31:18 -04:00
dm-snap-persistent.c	md: Add in export.h for files using EXPORT_SYMBOL	2011-10-31 19:31:19 -04:00
dm-snap-transient.c	md: Add in export.h for files using EXPORT_SYMBOL	2011-10-31 19:31:19 -04:00
dm-snap.c
dm-stripe.c
dm-sysfs.c
dm-table.c	block: Introduce blk_set_stacking_limits function	2012-01-11 16:27:11 +01:00
dm-target.c
dm-thin-metadata.c	dm: add thin provisioning target	2011-10-31 20:21:18 +00:00
dm-thin-metadata.h	dm: add thin provisioning target	2011-10-31 20:21:18 +00:00
dm-thin.c	dm: add thin provisioning target	2011-10-31 20:21:18 +00:00
dm-uevent.c	md: Add in export.h for files using EXPORT_SYMBOL	2011-10-31 19:31:19 -04:00
dm-uevent.h
dm-zero.c
dm.c	fs: move code out of buffer.c	2012-01-03 22:54:07 -05:00
dm.h	dm table: add immutable feature	2011-10-31 20:19:04 +00:00
faulty.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
Kconfig	dm: add thin provisioning target	2011-10-31 20:21:18 +00:00
linear.c	md/linear: fix hot-add of devices to linear arrays.	2011-12-23 09:56:55 +11:00
linear.h	md/linear: typedef removal: linear_conf_t -> struct linear_conf	2011-10-11 16:48:54 +11:00
Makefile	dm: add thin provisioning target	2011-10-31 20:21:18 +00:00
md.c	Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block	2012-01-15 12:24:45 -08:00
md.h	md: create externally visible flags for supporting hot-replace.	2011-12-23 10:17:51 +11:00
multipath.c	md: change hot_remove_disk to take an rdev rather than a number.	2011-12-23 10:17:51 +11:00
multipath.h	md/multipath: typedef removal: multipath_conf_t -> struct mpconf	2011-10-11 16:48:57 +11:00
raid0.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
raid0.h	md/raid0: typedef removal: raid0_conf_t -> struct r0conf	2011-10-11 16:48:59 +11:00
raid1.c	md/raid1: perform bad-block tests for WriteMostly devices too.	2012-01-11 08:35:17 +11:00
raid1.h	md/raid1: Allocate spare to store replacement devices and their bios.	2011-12-23 10:17:56 +11:00
raid5.c	md/raid5: Mark device want_replacement when we see a write error.	2011-12-23 10:17:54 +11:00
raid5.h	md/raid5: detect and handle replacements during recovery.	2011-12-23 10:17:53 +11:00
raid10.c	md/raid10: If there is a spare and a want_replacement device, start replacement.	2011-12-23 10:17:56 +11:00
raid10.h	md/raid10: prepare data structures for handling replacement.	2011-12-23 10:17:54 +11:00