diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-11 16:32:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-11 16:32:26 -0700 |
| commit | e5d081f4686f9c6be8ab3d34dfcdb0afdbbdeefd (patch) | |
| tree | 282eb834bedf508f94732ecdbe3e32fe7942d84e /drivers/scsi/fnic/fnic.h | |
| parent | 77f63b4da4b69f65c17c45e797ddb3013b889df9 (diff) | |
| parent | 7562523e84ddc742fe1f9db8bd76b01acca89f6b (diff) | |
| download | linux-e5d081f4686f9c6be8ab3d34dfcdb0afdbbdeefd.tar.gz linux-e5d081f4686f9c6be8ab3d34dfcdb0afdbbdeefd.tar.bz2 linux-e5d081f4686f9c6be8ab3d34dfcdb0afdbbdeefd.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is three bug fixes: An fnic warning caused by sleeping under a
lock, a major regression with our updated WRITE SAME/UNMAP logic which
caused tons of USB devices (and one RAID card) to cease to function
and a megaraid_sas firmware initialisation problem which causes kdump
failures"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
[SCSI] Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
[SCSI] fnic: BUG: sleeping function called from invalid context during probe
[SCSI] megaraid_sas: megaraid_sas driver init fails in kdump kernel
Diffstat (limited to 'drivers/scsi/fnic/fnic.h')
| -rw-r--r-- | drivers/scsi/fnic/fnic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index b6d1f92ed33c..c18c68150e9f 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -38,7 +38,7 @@ #define DRV_NAME "fnic" #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.5.0.22" +#define DRV_VERSION "1.5.0.23" #define PFX DRV_NAME ": " #define DFX DRV_NAME "%d: " |