diff options
| author |  Martin K. Petersen <martin.petersen@oracle.com>
| 2021-04-05 22:57:29 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com>
| 2021-04-05 22:57:29 -0400 |
| commit | 556666bce111b2a758010c2a2a6bab7f3770f4de (patch) | |
| tree | 3a35ea6f9a9aa43b82166afc1f329084dd55c729 /include/scsi | |
| parent | scsi: message: mptlan: Replace one-element array with flexible-array member (diff) | |
| parent | scsi: iscsi: Fix race condition between login and sync thread (diff) | |
| download | linux-556666bce111b2a758010c2a2a6bab7f3770f4de.tar.gz linux-556666bce111b2a758010c2a2a6bab7f3770f4de.tar.bz2 linux-556666bce111b2a758010c2a2a6bab7f3770f4de.zip | |
Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging
Pull 5.12/scsi-fixes into the 5.13 SCSI tree to provide a baseline for
some UFS changes that would otherwise cause conflicts during the
merge.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_transport_iscsi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h index 8a26a2ffa952..fc5a39839b4b 100644 --- a/include/scsi/scsi_transport_iscsi.h +++ b/include/scsi/scsi_transport_iscsi.h @@ -193,6 +193,7 @@ enum iscsi_connection_state { ISCSI_CONN_UP = 0, ISCSI_CONN_DOWN, ISCSI_CONN_FAILED, + ISCSI_CONN_BOUND, }; struct iscsi_cls_conn { |