diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-02-12 06:50:48 +0100 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-02-12 06:50:48 +0100 |
| commit | 2a8d9cdcfee67469dc2a993f59a47467a5eb4adf (patch) | |
| tree | 9ed007a920dad81abd2c2dfc860c205909f1dfc0 /drivers/scsi | |
| parent | scsi: fix soft lockup in scsi_remove_target() on module removal (diff) | |
| parent | SCSI: Add Marvell configuration device to VPD blacklist (diff) | |
| download | linux-2a8d9cdcfee67469dc2a993f59a47467a5eb4adf.tar.xz linux-2a8d9cdcfee67469dc2a993f59a47467a5eb4adf.zip | |
Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_devinfo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index da2e068ee47d..bbfbfd9e5aa3 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c @@ -206,6 +206,7 @@ static struct { {"iRiver", "iFP Mass Driver", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, {"LASOUND", "CDX7405", "3.10", BLIST_MAX5LUN | BLIST_SINGLELUN}, {"Marvell", "Console", NULL, BLIST_SKIP_VPD_PAGES}, + {"Marvell", "91xx Config", "1.01", BLIST_SKIP_VPD_PAGES}, {"MATSHITA", "PD-1", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, {"MATSHITA", "DMC-LC5", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, {"MATSHITA", "DMC-LC40", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, |