summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-blockLinus Torvalds2012-01-1511-112/+4261
|\
| * Merge branch 'for-3.3/mtip32xx' into for-3.3/driversJens Axboe2012-01-156-0/+4091
| |\
| | * mtip32xx: do rebuild monitoring asynchronouslyAsai Thambi S P2012-01-042-40/+65
| | * mtip32xx: uninitialized variable in mtip_quiesce_io()Dan Carpenter2011-11-241-1/+2
| | * mtip32xx: updates based on feedbackAsai Thambi S P2011-11-232-154/+230
| | * mtip32xx: update to new ->make_request() APIJens Axboe2011-11-051-10/+5
| | * mtip32xx: add module.h include to avoid conflict with moduleh treeJens Axboe2011-11-051-0/+1
| | * mtip32xx: mark a few more items staticJens Axboe2011-11-051-2/+2
| | * mtip32xx: ensure that all local functions are staticJens Axboe2011-11-052-352/+313
| | * mtip32xx: cleanup compat ioctl handlingJens Axboe2011-11-052-91/+64
| | * mtip32xx: fix warnings/errors on 32-bit compilesJens Axboe2011-11-051-7/+23
| | * block: Add driver for Micron RealSSD pcie flash cardsSam Bradshaw2011-11-056-0/+4043
| * | Merge branch 'stable/for-jens-3.3' of git://git.kernel.org/pub/scm/linux/kern...Jens Axboe2011-12-255-112/+170
| |\ \
| | * | xen-blkfront: Use kcalloc instead of kzalloc to allocate arrayThomas Meyer2011-12-161-1/+1
| | * | xen-blkback: convert hole punching to discard request on loop devicesLi Dongyang2011-11-181-17/+2
| | * | xen/blkback: Move processing of BLKIF_OP_DISCARD from dispatch_rw_block_ioKonrad Rzeszutek Wilk2011-11-181-30/+24
| | * | xen/blk[front|back]: Enhance discard support with secure erasing support.Konrad Rzeszutek Wilk2011-11-185-19/+77
| | * | xen/blk[front|back]: Squash blkif_request_rw and blkif_request_discard togetherKonrad Rzeszutek Wilk2011-11-184-62/+83
* | | | Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-blockLinus Torvalds2012-01-1528-949/+1121
|\ \ \ \
| * | | | Revert "block: recursive merge requests"Jens Axboe2012-01-151-12/+4
| * | | | block: Stop using macro stubs for the bio data integrity callsMartin K. Petersen2012-01-131-13/+53
| * | | | blockdev: convert some macros to static inlinesStephen Rothwell2012-01-121-13/+64
| * | | | fs: remove unneeded plug in mpage_readpages()Namjae Jeon2012-01-121-4/+0
| * | | | block: Add BLKROTATIONAL ioctlMartin K. Petersen2012-01-113-0/+6
| * | | | block: Introduce blk_set_stacking_limits functionMartin K. Petersen2012-01-114-11/+29
| * | | | block: remove WARN_ON_ONCE() in exit_io_context()Tejun Heo2011-12-271-3/+0
| |/ / /
| * | | block: an exiting task should be allowed to create io_contextTejun Heo2011-12-251-2/+9
| * | | block: ioc_cgroup_changed() needs to be exportedJens Axboe2011-12-191-0/+1
| * | | block: recursive merge requestsShaohua Li2011-12-161-4/+12
| * | | block, cfq: fix empty queue crash caused by request mergeShaohua Li2011-12-161-0/+12
| * | | block, cfq: move icq creation and rq->elv.icq association to block coreTejun Heo2011-12-146-136/+173
| * | | block, cfq: restructure io_cq creation path for io_context interface cleanupTejun Heo2011-12-142-53/+43
| * | | block, cfq: move io_cq exit/release to blk-ioc.cTejun Heo2011-12-147-61/+97
| * | | block, cfq: move icq cache management to block coreTejun Heo2011-12-145-42/+62
| * | | block, cfq: move io_cq lookup to blk-ioc.cTejun Heo2011-12-143-40/+45
| * | | block, cfq: move cfqd->icq_list to request_queue and add request->elv.icqTejun Heo2011-12-144-21/+20
| * | | block, cfq: reorganize cfq_io_context into generic and cfq specific partsTejun Heo2011-12-143-174/+175
| * | | block: remove elevator_queue->opsTejun Heo2011-12-143-46/+43
| * | | block: reorder elevator switch sequenceTejun Heo2011-12-141-54/+37
| * | | block, cfq: replace current_io_context() with create_io_context()Tejun Heo2011-12-144-54/+71
| * | | block, cfq: kill cic->keyTejun Heo2011-12-142-22/+5
| * | | block, cfq: kill ioc_goneTejun Heo2011-12-142-55/+5
| * | | block, cfq: remove delayed unlinkTejun Heo2011-12-143-99/+10
| * | | block, cfq: unlink cfq_io_context's immediatelyTejun Heo2011-12-147-72/+159
| * | | block, cfq: fix cic lookup lockingTejun Heo2011-12-141-32/+35
| * | | block, cfq: fix race condition in cic creation path and tighten lockingTejun Heo2011-12-141-59/+76
| * | | block, cfq: move ioc ioprio/cgroup changed handling to cicTejun Heo2011-12-145-27/+65
| * | | block, cfq: misc updates to cfq_io_contextTejun Heo2011-12-142-26/+33
| * | | block: misc updates to blk_get_queue()Tejun Heo2011-12-146-10/+13
| * | | block: make ioc get/put interface more conventional and fix race on alloctionTejun Heo2011-12-147-69/+91
OpenPOWER on IntegriCloud