Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

[mirror_ubuntu-bionic-kernel.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index da12f2649cced4266daaf85ca2ba42a95707013e..e10895647f728bc2cca05c1f39a37a0f49659d5e 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -49,13 +49,23 @@ config LSF
 
          If unsure, say Y.
 
-endif # BLOCK
-
 config BLK_DEV_BSG
-       bool "Block layer SG support"
-       default y
+       bool "Block layer SG support v4 (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
        ---help---
-       Saying Y here will enable generic SG (SCSI generic) v3
-       support for any block device.
+       Saying Y here will enable generic SG (SCSI generic) v4 support
+       for any block device.
+
+       Unlike SG v3 (aka block/scsi_ioctl.c drivers/scsi/sg.c), SG v4
+       can handle complicated SCSI commands: tagged variable length cdbs
+       with bidirectional data transfers and generic request/response
+       protocols (e.g. Task Management Functions and SMP in Serial
+       Attached SCSI).
+
+config BLOCK_COMPAT
+       bool
+       default y
+
+endif # BLOCK
 
 source block/Kconfig.iosched