diff options
| author |   James Bottomley <JBottomley@Parallels.com> | 2014-12-08 07:42:02 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 07:42:25 -0800 |
| commit | 096cbc35eaecf5865a3274f21eae26955b32861b (patch) | |
| tree | 8c6f085fd648939bfbc6ae41cd3f0204e32c5e07 /drivers/scsi/isci/task.h | |
| parent | Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus (diff) | |
| parent | libsas: remove task_collector mode (diff) | |
| download | linux-dev-096cbc35eaecf5865a3274f21eae26955b32861b.tar.xz linux-dev-096cbc35eaecf5865a3274f21eae26955b32861b.zip | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Conflicts:
drivers/scsi/scsi_debug.c
Agreed and tested resolution to a merge problem between a fix in scsi_debug
and a driver update
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/isci/task.h')
| -rw-r--r-- | drivers/scsi/isci/task.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/isci/task.h b/drivers/scsi/isci/task.h index 9c06cbad1d26..8f4531f22ac2 100644 --- a/drivers/scsi/isci/task.h +++ b/drivers/scsi/isci/task.h @@ -131,7 +131,6 @@ static inline void isci_print_tmf(struct isci_host *ihost, struct isci_tmf *tmf) int isci_task_execute_task( struct sas_task *task, - int num, gfp_t gfp_flags); int isci_task_abort_task( |