diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2017-11-01 21:00:19 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-11-01 21:00:19 +0100 |
| commit | da2963e8fcd77c328f3da40c0aa8b650f18ed9ed (patch) | |
| tree | e53458c1024d34fbe27d6a77b5c196507abb5bb3 /include | |
| parent | timer: Add parenthesis around timer_setup() macro arguments (diff) | |
| parent | drm: gma500: Convert timers to use timer_setup() (diff) | |
| download | wireguard-linux-da2963e8fcd77c328f3da40c0aa8b650f18ed9ed.tar.xz wireguard-linux-da2963e8fcd77c328f3da40c0aa8b650f18ed9ed.zip | |
Merge tag 'timers-conversion-next2' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/core
Pull the next batch of timer conversions from Kees Cook:
- Second batch of scsi conversions that have been Reviewed and/or Acked.
- Various *_on_stack() changes for USB, Acked by Greg.
- DRM conversion that was declared too late for drm's tree, but Acked for timers.
- RAS driver conversion, Acked.
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/libsas.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 6c0dc6155ee7..388aaf72b480 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -629,6 +629,7 @@ struct sas_task_slow { */ struct timer_list timer; struct completion completion; + struct sas_task *task; }; #define SAS_TASK_STATE_PENDING 1 |