Merge branch 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block
* 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block: (25 commits) bsg: Kconfig updates bsg: add SCSI transport-level request support bsg: add bidi support add a struct request pointer to the request structure bsg: fix the deadlock on discarding done commands bsg: fix a blocking read bug bsg: minor bug fixes improve bsg device allocation bind bsg to all SCSI devices bsg: bind bsg to request_queue instead of gendisk bsg: add a request_queue argument to scsi_cmd_ioctl() bsg: simplify __bsg_alloc_command failpath bsg: add cheasy error checks for sysfs stuff Add queue resizing support Replace s32, u32 and u64 with __s32, __u32 and __u64 in bsg.h for userspace bsg: silence a bogus gcc warning bsg: style cleanup bsg: use u32 etc instead of uint32_t bsg: add SG_IO to SG v4 bsg: replace SG v3 with SG v4 ...
Showing
- block/Kconfig 8 additions, 0 deletionsblock/Kconfig
- block/Makefile 1 addition, 0 deletionsblock/Makefile
- block/bsg.c 1114 additions, 0 deletionsblock/bsg.c
- block/ll_rw_blk.c 1 addition, 0 deletionsblock/ll_rw_blk.c
- block/scsi_ioctl.c 95 additions, 68 deletionsblock/scsi_ioctl.c
- drivers/block/ub.c 1 addition, 1 deletiondrivers/block/ub.c
- drivers/cdrom/cdrom.c 2 additions, 1 deletiondrivers/cdrom/cdrom.c
- drivers/ide/ide-floppy.c 16 additions, 13 deletionsdrivers/ide/ide-floppy.c
- drivers/ide/ide.c 5 additions, 5 deletionsdrivers/ide/ide.c
- drivers/scsi/sd.c 1 addition, 1 deletiondrivers/scsi/sd.c
- drivers/scsi/st.c 2 additions, 1 deletiondrivers/scsi/st.c
- include/linux/blkdev.h 25 additions, 1 deletioninclude/linux/blkdev.h
- include/linux/bsg.h 70 additions, 0 deletionsinclude/linux/bsg.h
Please register or sign in to comment