Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block: (38 commits) block: don't access jiffies when initialising io_context cfq: remove 8 bytes of padding from cfq_rb_root on 64 bit builds block: fix for "Consolidate phys_segment and hw_segment limits" cfq-iosched: quantum check tweak blktrace: perform cleanup after setup error blkdev: fix merge_bvec_fn return value checks cfq-iosched: requests "in flight" vs "in driver" clarification cciss: Fix problem with scatter gather elements in the scsi half of the driver cciss: eliminate unnecessary pointer use in cciss scsi code cciss: do not use void pointer for scsi hba data cciss: factor out scatter gather chain block mapping code cciss: fix scatter gather chain block dma direction kludge cciss: simplify scatter gather code cciss: factor out scatter gather chain block allocation and freeing cciss: detect bad alignment of scsi commands at build time cciss: clarify command list padding calculation cfq-iosched: rethink seeky detection for SSDs cfq-iosched: rework seeky detection block: remove padding from io_context on 64bit builds block: Consolidate phys_segment and hw_segment limits ...
Showing
- Documentation/ABI/testing/sysfs-block 14 additions, 0 deletionsDocumentation/ABI/testing/sysfs-block
- Documentation/block/queue-sysfs.txt 5 additions, 5 deletionsDocumentation/block/queue-sysfs.txt
- arch/um/drivers/ubd_kern.c 2 additions, 2 deletionsarch/um/drivers/ubd_kern.c
- block/blk-cgroup.c 0 additions, 14 deletionsblock/blk-cgroup.c
- block/blk-cgroup.h 0 additions, 3 deletionsblock/blk-cgroup.h
- block/blk-core.c 15 additions, 19 deletionsblock/blk-core.c
- block/blk-ioc.c 1 addition, 1 deletionblock/blk-ioc.c
- block/blk-merge.c 2 additions, 6 deletionsblock/blk-merge.c
- block/blk-settings.c 42 additions, 89 deletionsblock/blk-settings.c
- block/blk-sysfs.c 7 additions, 4 deletionsblock/blk-sysfs.c
- block/cfq-iosched.c 68 additions, 79 deletionsblock/cfq-iosched.c
- block/elevator.c 10 additions, 1 deletionblock/elevator.c
- drivers/ata/libata-scsi.c 1 addition, 1 deletiondrivers/ata/libata-scsi.c
- drivers/ata/sata_nv.c 1 addition, 1 deletiondrivers/ata/sata_nv.c
- drivers/block/DAC960.c 3 additions, 3 deletionsdrivers/block/DAC960.c
- drivers/block/brd.c 1 addition, 1 deletiondrivers/block/brd.c
- drivers/block/cciss.c 107 additions, 111 deletionsdrivers/block/cciss.c
- drivers/block/cciss.h 6 additions, 15 deletionsdrivers/block/cciss.h
- drivers/block/cciss_cmd.h 31 additions, 133 deletionsdrivers/block/cciss_cmd.h
- drivers/block/cciss_scsi.c 89 additions, 56 deletionsdrivers/block/cciss_scsi.c
Loading
Please register or sign in to comment