summaryrefslogtreecommitdiffstats
path: root/drivers/block
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.6/drivers' of git://git.kernel.dk/linux-blockLinus Torvalds2012-08-0112-100/+182
|\
| * Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Jens Axboe2012-07-311-2/+1
| |\
| | * floppy: remove duplicated flag FD_RAW_NEED_DISKFengguang Wu2012-07-311-2/+1
| * | blk: pass from_schedule to non-request unplug functions.NeilBrown2012-07-311-1/+1
| * | blk: centralize non-request unplug handling.NeilBrown2012-07-311-29/+6
| * | block/nbd: micro-optimization in nbd request completionChetan Loke2012-07-311-1/+1
| * | Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/driversJens Axboe2012-07-3012-73/+159
| |\ \
| | * | drbd: announce FLUSH/FUA capability to upper layersLars Ellenberg2012-07-244-8/+23
| | * | drbd: fix max_bio_size to be unsignedLars Ellenberg2012-07-243-15/+17
| | * | drbd: flush drbd work queue before invalidate/invalidate remoteLars Ellenberg2012-07-242-6/+12
| | * | drbd: fix potential access after freeLars Ellenberg2012-07-241-5/+12
| | * | drbd: call local-io-error handler earlyLars Ellenberg2012-07-241-3/+3
| | * | drbd: do not reset rs_pending_cnt too earlyLars Ellenberg2012-07-243-12/+12
| | * | drbd: reset congestion information before reporting it in /proc/drbdLars Ellenberg2012-07-241-0/+3
| | * | drbd: report congestion if we are waiting for some userland callbackLars Ellenberg2012-07-243-0/+29
| | * | drbd: differentiate between normal and forced detachLars Ellenberg2012-07-247-15/+42
| | * | drbd: cleanup, remove two unused global flagsLars Ellenberg2012-07-241-2/+0
| * | | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Jens Axboe2012-07-241-1/+20
| |\ \ \ | | | |/ | | |/|
| | * | floppy: Run floppy initialization asynchronousAndi Kleen2012-07-041-1/+20
* | | | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-07-311-1/+5
|\ \ \ \
| * | | | nbd: set SOCK_MEMALLOC for access to PFMEMALLOC reservesMel Gorman2012-07-311-1/+5
* | | | | Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-07-311-3/+2
|\ \ \ \ \
| * | | | | xen-blkfront: remove IRQF_SAMPLE_RANDOM which is now a no-opTheodore Ts'o2012-07-191-3/+2
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2012-07-312-355/+462
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | rbd: create rbd_refresh_helper()Alex Elder2012-07-301-10/+15
| * | | | | rbd: return obj version in __rbd_refresh_header()Alex Elder2012-07-301-14/+11
| * | | | | rbd: fixes in rbd_header_from_disk()Alex Elder2012-07-301-5/+13
| * | | | | rbd: always pass ops array to rbd_req_sync_op()Alex Elder2012-07-301-30/+16
| * | | | | rbd: pass null version pointer in add_snap()Alex Elder2012-07-301-2/+1
| * | | | | rbd: make rbd_create_rw_ops() return a pointerAlex Elder2012-07-301-31/+39
| * | | | | rbd: have __rbd_add_snap_dev() return a pointerAlex Elder2012-07-301-15/+22
| * | | | | rbd: drop "object_name" from rbd_req_sync_unwatch()Alex Elder2012-07-301-4/+5
| * | | | | rbd: drop "object_name" from rbd_req_sync_notify_ack()Alex Elder2012-07-301-4/+3
| * | | | | rbd: drop "object_name" from rbd_req_sync_notify()Alex Elder2012-07-301-4/+4
| * | | | | rbd: drop "object_name" from rbd_req_sync_watch()Alex Elder2012-07-301-7/+5
| * | | | | rbd: drop rbd_dev parameter in snap functionsAlex Elder2012-07-301-12/+7
| * | | | | rbd: drop rbd_header_from_disk() gfp_flags parameterAlex Elder2012-07-301-7/+6
| * | | | | rbd: snapc is unused in rbd_req_sync_read()Alex Elder2012-07-301-2/+1
| * | | | | rbd: rename rbd_device->idAlex Elder2012-07-301-8/+8
| * | | | | rbd: encapsulate header validity testAlex Elder2012-07-301-1/+7
| * | | | | rbd: clean up a few dout() callsAlex Elder2012-07-301-19/+22
| * | | | | rbd: simplify __rbd_remove_all_snaps()Alex Elder2012-07-301-3/+2
| * | | | | rbd: drop extra header_rwsem initAlex Elder2012-07-301-2/+0
| * | | | | rbd: kill rbd_image_header->snap_seqAlex Elder2012-07-301-2/+0
| * | | | | rbd: set snapc->seq only when refreshing headerAlex Elder2012-07-301-8/+2
| * | | | | rbd: preserve snapc->seq in rbd_header_set_snap()Alex Elder2012-07-301-11/+7
| * | | | | rbd: don't use snapc->seq that wayAlex Elder2012-07-301-14/+0
| * | | | | rbd: send header version when notifyingJosh Durgin2012-07-301-2/+5
| * | | | | rbd: use reference counting for the snap contextJosh Durgin2012-07-301-18/+18
| * | | | | rbd: set image size when header is updatedJosh Durgin2012-07-301-0/+1
OpenPOWER on IntegriCloud