summaryrefslogtreecommitdiffstats
path: root/drivers/block
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2011-01-072-4/+4
|\
| * xen: don't use flush_scheduled_work()Tejun Heo2010-12-241-2/+2
| * floppy: don't use flush_scheduled_work()Tejun Heo2010-12-241-2/+2
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-12-269-317/+534
|\ \
| * | Fix build error in drivers/block/cciss.cLinus Torvalds2010-12-201-1/+1
| * | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-12-204-8/+21
| |\ \
| | * | cciss: fix cciss_revalidate panicStephen M. Cameron2010-12-171-0/+2
| | * | drbd: fix for spin_lock_irqsave in endio callbackLars Ellenberg2010-11-272-2/+11
| | * | drbd: don't recvmsg with zero lengthLars Ellenberg2010-11-271-6/+8
| * | | xen: Provide a variant of __RING_SIZE() that is an integer constant expressionJeremy Fitzhardinge2010-12-151-1/+1
| * | | Merge branch 'rbd-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2010-12-021-277/+471
| |\ \ \ | | |/ / | |/| |
| | * | rbd: replace the rbd sysfs interfaceYehuda Sadeh2010-12-011-277/+471
| | |/
| * | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-11-274-26/+36
| |\ \ | | |/ | |/|
| | * cciss: fix build for PROC_FS disabledJens Axboe2010-11-171-2/+1
| | * block: fix amiga and atari floppy driver compile warningVivek Goyal2010-11-152-2/+2
| | * Merge branch 'upstream/blkfront' of git://git.kernel.org/pub/scm/linux/kernel...Jens Axboe2010-11-121-22/+33
| | |\
| | | * xen/blkfront: cope with backend that fail empty BLKIF_OP_WRITE_BARRIER requestsJeremy Fitzhardinge2010-11-021-0/+10
| | | * xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIERJeremy Fitzhardinge2010-11-021-2/+12
| | | * xen/blkfront: change blk_shadow.request to proper pointerJeremy Fitzhardinge2010-11-021-8/+6
| | | * xen/blkfront: map REQ_FLUSH into a full barrierJeremy Fitzhardinge2010-11-021-14/+5
| * | | BKL: remove extraneous #include <smp_lock.h>Arnd Bergmann2010-11-172-2/+0
| * | | SCSI host lock push-downJeff Garzik2010-11-161-3/+5
* | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-11-1413-425/+267
|\ \ \ \ | |/ / /
| * | | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-11-1213-425/+267
| |\ \ \ | | |/ /
| | * | block: remove REQ_HARDBARRIERChristoph Hellwig2010-11-103-11/+0
| | * | Merge branch 'for-2.6.37/drivers' into for-linusJens Axboe2010-11-1010-412/+264
| | |\ \
| | | * | cciss: remove controllers supported by hpsaStephen M. Cameron2010-10-231-41/+4
| | | * | cciss: use usleep_range not msleep for small sleepsStephen M. Cameron2010-10-231-1/+1
| | | * | cciss: limit commands allocated on reset_devicesStephen M. Cameron2010-10-231-0/+5
| | | * | cciss: Use kernel provided PCI state save and restore functionsStephen M. Cameron2010-10-231-58/+15
| | | * | cciss: fix board status waiting codeStephen M. Cameron2010-10-232-8/+39
| | | * | Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-2.6.37/...Jens Axboe2010-10-238-343/+201
| | | |\ \
| | | | * | drbd: Removed checks for REQ_HARDBARRIER on incomming BIOsPhilipp Reisner2010-10-233-20/+0
| | | | * | drbd: REQ_HARDBARRIER -> REQ_FUA transition for meta data accessesPhilipp Reisner2010-10-233-20/+7
| | | | * | drbd: Removed the BIO_RW_BARRIER support form the receiver/epoch codePhilipp Reisner2010-10-236-219/+33
| | | | * | drbd: Silenced an assertPhilipp Reisner2010-10-221-1/+1
| | | | * | drbd: rate limit an error messageLars Ellenberg2010-10-221-1/+2
| | | | * | drbd: fix a misleading printkLars Ellenberg2010-10-221-1/+1
| | | | * | drbd: fix potential data divergence after multiple failuresLars Ellenberg2010-10-223-11/+37
| | | | * | drbd: fix potential deadlock on detachLars Ellenberg2010-10-224-63/+113
| | | | * | drbd: tag a few error messages with "assert failed"Lars Ellenberg2010-10-221-5/+5
| | | | * | drbd: consolidate explicit drbd_md_sync into drbd_create_new_uuidLars Ellenberg2010-10-222-2/+2
| | * | | | block: read i_size with i_size_read()Mike Snitzer2010-11-101-1/+1
| | * | | | cciss: fix proc warning on attempt to remove non-existant directoryJens Axboe2010-11-101-1/+2
* | | | | | aoe: remove dev_base_lock use from aoecmd_cfg_pkts()Eric Dumazet2010-11-081-3/+3
|/ / / / /
* | | | | floppy: fix another use-after-freeVivek Goyal2010-11-061-1/+1
|/ / / /
* | | | floppy: fix use-after-free in module load failure pathLinus Torvalds2010-11-051-1/+1
| |_|/ |/| |
* | | Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2010-10-281-0/+2
|\ \ \
| * \ \ Merge commit 'konrad/stable/xen-pcifront-0.8.2' into 2.6.36-rc8-initial-domai...Stefano Stabellini2010-10-221-0/+2
| |\ \ \
| | * | | xenbus: prevent warnings on unhandled enumeration valuesNoboru Iwamatsu2010-10-181-0/+2
OpenPOWER on IntegriCloud