diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 15:55:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 15:55:29 -0400 |
| commit | 424a6f6ef990b7e9f56f6627bfc6c46b493faeb4 (patch) | |
| tree | 0028356ed8003495fbbe1f716f359e3c8ebc35b6 /drivers/scsi/Kconfig | |
| parent | 1ab142d499294b844ecc81e8004db4ce029b0b61 (diff) | |
| parent | cd8df932d894f3128c884e3ae1b2b484540513db (diff) | |
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
SCSI updates from James Bottomley:
"The update includes the usual assortment of driver updates (lpfc,
qla2xxx, qla4xxx, bfa, bnx2fc, bnx2i, isci, fcoe, hpsa) plus a huge
amount of infrastructure work in the SAS library and transport class
as well as an iSCSI update. There's also a new SCSI based virtio
driver."
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (177 commits)
[SCSI] qla4xxx: Update driver version to 5.02.00-k15
[SCSI] qla4xxx: trivial cleanup
[SCSI] qla4xxx: Fix sparse warning
[SCSI] qla4xxx: Add support for multiple session per host.
[SCSI] qla4xxx: Export CHAP index as sysfs attribute
[SCSI] scsi_transport: Export CHAP index as sysfs attribute
[SCSI] qla4xxx: Add support to display CHAP list and delete CHAP entry
[SCSI] iscsi_transport: Add support to display CHAP list and delete CHAP entry
[SCSI] pm8001: fix endian issue with code optimization.
[SCSI] pm8001: Fix possible racing condition.
[SCSI] pm8001: Fix bogus interrupt state flag issue.
[SCSI] ipr: update PCI ID definitions for new adapters
[SCSI] qla2xxx: handle default case in qla2x00_request_firmware()
[SCSI] isci: improvements in driver unloading routine
[SCSI] isci: improve phy event warnings
[SCSI] isci: debug, provide state-enum-to-string conversions
[SCSI] scsi_transport_sas: 'enable' phys on reset
[SCSI] libsas: don't recover end devices attached to disabled phys
[SCSI] libsas: fixup target_port_protocols for expanders that don't report sata
[SCSI] libsas: set attached device type and target protocols for local phys
...
Diffstat (limited to 'drivers/scsi/Kconfig')
| -rw-r--r-- | drivers/scsi/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 4e89103204dc..a06e608789e3 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -1903,6 +1903,14 @@ config SCSI_BFA_FC | |||
| 1903 | To compile this driver as a module, choose M here. The module will | 1903 | To compile this driver as a module, choose M here. The module will |
| 1904 | be called bfa. | 1904 | be called bfa. |
| 1905 | 1905 | ||
| 1906 | config SCSI_VIRTIO | ||
| 1907 | tristate "virtio-scsi support (EXPERIMENTAL)" | ||
| 1908 | depends on EXPERIMENTAL && VIRTIO | ||
| 1909 | help | ||
| 1910 | This is the virtual HBA driver for virtio. If the kernel will | ||
| 1911 | be used in a virtual machine, say Y or M. | ||
| 1912 | |||
| 1913 | |||
| 1906 | endif # SCSI_LOWLEVEL | 1914 | endif # SCSI_LOWLEVEL |
| 1907 | 1915 | ||
| 1908 | source "drivers/scsi/pcmcia/Kconfig" | 1916 | source "drivers/scsi/pcmcia/Kconfig" |