diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 21:57:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 21:57:01 -0400 |
| commit | 6a5a3d6a4adde0c66f3be29bbd7c0d6ffb7e1a40 (patch) | |
| tree | ae416ffa4458df755f984a05d65ee1c3e220c40b /include/linux | |
| parent | 8bbbfa70549bd84f29ff331d0ac051897ccbbd72 (diff) | |
| parent | 5c1b10ab7f93d24f29b5630286e323d1c5802d5c (diff) | |
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull misc SCSI updates from James Bottomley:
"This is an assorted set of stragglers into the merge window with
driver updates for megaraid_sas, lpfc, bfi and mvumi. It also
includes some fairly major fixes for virtio-scsi (scatterlist init),
scsi_debug (off by one error), storvsc (use after free) and qla2xxx
(potential deadlock).
Signed-off-by: James Bottomley <JBottomley@Parallels.com>"
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (49 commits)
[SCSI] storvsc: Account for in-transit packets in the RESET path
[SCSI] qla2xxx: fix potential deadlock on ha->hardware_lock
[SCSI] scsi_debug: Fix off-by-one bug when unmapping region
[SCSI] Shorten the path length of scsi_cmd_to_driver()
[SCSI] virtio-scsi: support online resizing of disks
[SCSI] virtio-scsi: fix LUNs greater than 255
[SCSI] virtio-scsi: initialize scatterlist structure
[SCSI] megaraid_sas: Version, Changelog, Copyright update
[SCSI] megaraid_sas: Remove duplicate code
[SCSI] megaraid_sas: Add SystemPD FastPath support
[SCSI] megaraid_sas: Add array boundary check for SystemPD
[SCSI] megaraid_sas: Load io_request DataLength in bytes
[SCSI] megaraid_sas: Add module param for configurable MSI-X vector count
[SCSI] megaraid_sas: Remove un-needed completion_lock spinlock calls
[SCSI] lpfc 8.3.35: Update lpfc version for 8.3.35 driver release
[SCSI] lpfc 8.3.35: Fixed not reporting logical link speed to SCSI midlayer when QoS not on
[SCSI] lpfc 8.3.35: Fix error with fabric service parameters causing performance issues
[SCSI] lpfc 8.3.35: Fixed SCSI host create showing wrong link speed on SLI3 HBA ports
[SCSI] lpfc 8.3.35: Fixed not checking solicition in progress bit when verifying FCF record for use
[SCSI] lpfc 8.3.35: Fixed messages for misconfigured port errors
...
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/virtio_scsi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/virtio_scsi.h b/include/linux/virtio_scsi.h index dc8d305b0e05..d6b4440387b7 100644 --- a/include/linux/virtio_scsi.h +++ b/include/linux/virtio_scsi.h | |||
| @@ -72,6 +72,7 @@ struct virtio_scsi_config { | |||
| 72 | /* Feature Bits */ | 72 | /* Feature Bits */ |
| 73 | #define VIRTIO_SCSI_F_INOUT 0 | 73 | #define VIRTIO_SCSI_F_INOUT 0 |
| 74 | #define VIRTIO_SCSI_F_HOTPLUG 1 | 74 | #define VIRTIO_SCSI_F_HOTPLUG 1 |
| 75 | #define VIRTIO_SCSI_F_CHANGE 2 | ||
| 75 | 76 | ||
| 76 | /* Response codes */ | 77 | /* Response codes */ |
| 77 | #define VIRTIO_SCSI_S_OK 0 | 78 | #define VIRTIO_SCSI_S_OK 0 |
| @@ -108,6 +109,7 @@ struct virtio_scsi_config { | |||
| 108 | #define VIRTIO_SCSI_T_NO_EVENT 0 | 109 | #define VIRTIO_SCSI_T_NO_EVENT 0 |
| 109 | #define VIRTIO_SCSI_T_TRANSPORT_RESET 1 | 110 | #define VIRTIO_SCSI_T_TRANSPORT_RESET 1 |
| 110 | #define VIRTIO_SCSI_T_ASYNC_NOTIFY 2 | 111 | #define VIRTIO_SCSI_T_ASYNC_NOTIFY 2 |
| 112 | #define VIRTIO_SCSI_T_PARAM_CHANGE 3 | ||
| 111 | 113 | ||
| 112 | /* Reasons of transport reset event */ | 114 | /* Reasons of transport reset event */ |
| 113 | #define VIRTIO_SCSI_EVT_RESET_HARD 0 | 115 | #define VIRTIO_SCSI_EVT_RESET_HARD 0 |
