diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2019-10-10 03:54:04 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2019-10-10 03:54:04 +0200 |
| commit | a3a8d13f625d9f20664515d61d4c9a9452119d21 (patch) | |
| tree | 8d3bd45b741f10980c141cc35c06143a82e8ea18 /include/scsi | |
| parent | scsi: target: Remove tpg_list and se_portal_group.se_tpg_node (diff) | |
| parent | scsi: MAINTAINERS: Update qla2xxx driver (diff) | |
| download | linux-a3a8d13f625d9f20664515d61d4c9a9452119d21.tar.xz linux-a3a8d13f625d9f20664515d61d4c9a9452119d21.zip | |
Merge branch '5.4/scsi-fixes' into 5.5/scsi-queue
The qla2xxx driver updates for 5.5 depend on the fixes queued for
5.4.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_eh.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h index 3810b340551c..6bd5ed695a5e 100644 --- a/include/scsi/scsi_eh.h +++ b/include/scsi/scsi_eh.h @@ -32,6 +32,7 @@ extern int scsi_ioctl_reset(struct scsi_device *, int __user *); struct scsi_eh_save { /* saved state */ int result; + unsigned int resid_len; int eh_eflags; enum dma_data_direction data_direction; unsigned underflow; |