summaryrefslogtreecommitdiffstats
path: root/drivers/block
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2013-05-151-386/+549
|\
| * rbd: re-submit flattened write request (part 2)Alex Elder2013-05-131-2/+16
| * rbd: re-submit write request for flattened cloneAlex Elder2013-05-131-7/+22
| * rbd: re-submit read request for flattened cloneAlex Elder2013-05-131-5/+25
| * rbd: detect when clone image is flattenedAlex Elder2013-05-131-2/+28
| * rbd: reference count parent requestsAlex Elder2013-05-131-2/+102
| * rbd: define parent image request routinesAlex Elder2013-05-131-23/+55
| * rbd: define rbd_dev_unparent()Alex Elder2013-05-131-5/+13
| * rbd: don't release write request until necessaryAlex Elder2013-05-131-12/+7
| * rbd: get parent info on refreshAlex Elder2013-05-131-30/+37
| * rbd: ignore zero-overlap parentAlex Elder2013-05-131-3/+7
| * rbd: support reading parent page data for writesAlex Elder2013-05-131-6/+14
| * rbd: fix parent request size assumptionAlex Elder2013-05-131-11/+20
| * rbd: kill rbd_img_request_get()Alex Elder2013-05-081-10/+0
| * rbd: only set up watch for mapped imagesAlex Elder2013-05-081-19/+24
| * rbd: set mapping read-only flag in rbd_add()Alex Elder2013-05-081-12/+11
| * rbd: support reading parent page dataAlex Elder2013-05-081-3/+7
| * rbd: fix an incorrect assertion conditionAlex Elder2013-05-081-3/+3
| * rbd: define rbd_dev_v2_header_info()Alex Elder2013-05-081-24/+18
| * rbd: get rid of trivial v1 header wrappersAlex Elder2013-05-081-17/+4
| * rbd: simplify rbd_dev_v1_probe()Alex Elder2013-05-081-30/+7
| * rbd: update in-core header directlyAlex Elder2013-05-081-71/+27
| * rbd: refactor rbd_header_from_disk()Alex Elder2013-05-081-52/+75
| * rbd: zero format 1 header structure earlierAlex Elder2013-05-081-2/+1
| * rbd: set the mapping size and features laterAlex Elder2013-05-081-13/+14
| * rbd: always set read-only flag in rbd_add()Alex Elder2013-05-081-14/+14
| * rbd: kill rbd_dev_clear_mapping()Alex Elder2013-05-081-8/+1
| * rbd: don't look up snapshot id in rbd_dev_mapping_set()Alex Elder2013-05-081-10/+1
| * rbd: don't print warning if not mapping a parentAlex Elder2013-05-081-5/+6
| * rbd: kill rbd_update_mapping_size()Alex Elder2013-05-081-11/+6
| * rbd: update capacity in rbd_dev_refresh()Alex Elder2013-05-081-8/+15
| * rbd: revalidate only for mapping size changesAlex Elder2013-05-081-7/+9
| * rbd: fix leak of format 2 snapshot contextAlex Elder2013-05-081-0/+1
* | Merge git://git.infradead.org/users/willy/linux-nvmeLinus Torvalds2013-05-093-164/+3484
|\ \
| * | NVMe: Use user defined admin ioctl timeoutKeith Busch2013-05-091-1/+5
| * | NVMe: Simplify Firmware Activate code slightlyMatthew Wilcox2013-05-081-4/+2
| * | NVMe: Only clear the enable bit when disabling controllerMatthew Wilcox2013-05-081-1/+4
| * | NVMe: Wait for device to acknowledge shutdownMatthew Wilcox2013-05-081-19/+46
| * | NVMe: Schedule timeout for sync commandsKeith Busch2013-05-021-1/+1
| * | NVMe: Meta-data support in NVME_IOCTL_SUBMIT_IOKeith Busch2013-05-021-4/+67
| * | NVMe: Device specific stripe size handlingKeith Busch2013-05-021-4/+15
| * | NVMe: Split non-mergeable bio requestsKeith Busch2013-05-021-30/+122
| * | NVMe: Remove dead code in nvme_dev_addKeith Busch2013-05-021-9/+2
| * | NVMe: Check for NULL memory in nvme_dev_addKeith Busch2013-05-021-0/+2
| * | NVMe: Fix error clean-up on nvme_alloc_queueKeith Busch2013-05-021-1/+1
| * | NVMe: Free admin queue on request_irq errorKeith Busch2013-05-021-4/+9
| * | NVMe: Add scsi unmap to SG_IOKeith Busch2013-05-021-0/+78
| * | NVMe: queue usage fixes in nvme-scsiKeith Busch2013-05-021-5/+20
| * | NVMe: Set TASK_INTERRUPTIBLE before processing queuesArjan van de Ven2013-05-011-2/+1
| * | NVMe: Add a character device for each nvme deviceKeith Busch2013-04-161-10/+64