Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e245befc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 14dc5249 58ff411e

block/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -51,4 +51,12 @@ config LSF 


endif # BLOCK



config BLK_DEV_BSG

	bool "Block layer SG support"

	depends on SCSI && EXPERIMENTAL

	default y

	---help---

	Saying Y here will enable generic SG (SCSI generic) v4

	support for any block device.



source block/Kconfig.iosched

block/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


obj-$(CONFIG_BLOCK) := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o



obj-$(CONFIG_BLK_DEV_BSG)	+= bsg.o

obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o

obj-$(CONFIG_IOSCHED_AS)	+= as-iosched.o

obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o