diff options
| author | Linus Torvalds | 2015-03-25 01:08:29 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2015-03-25 01:08:29 +0100 |
| commit | 1401b7c3ec5a8521e53a56c0da27f743b4765d26 (patch) | |
| tree | dc88349fec6b4d10c44b3fa22ed25fa5c0de1e1e /drivers/scsi/libsas | |
| parent | Merge tag 'mfd-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/le... (diff) | |
| parent | ata: Add a new flag to destinguish sas controller (diff) | |
| download | kernel-qcow2-linux-1401b7c3ec5a8521e53a56c0da27f743b4765d26.tar.gz kernel-qcow2-linux-1401b7c3ec5a8521e53a56c0da27f743b4765d26.tar.xz kernel-qcow2-linux-1401b7c3ec5a8521e53a56c0da27f743b4765d26.zip | |
Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fix from Tejun Heo:
"One patch to fix a regression from the recent switch to blk-mq tag
allocation which can cause oops on SAS-attached SATA drives"
* 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ata: Add a new flag to destinguish sas controller
Diffstat (limited to 'drivers/scsi/libsas')
| -rw-r--r-- | drivers/scsi/libsas/sas_ata.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 932d9cc98d2f..9c706d8c1441 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c @@ -547,7 +547,8 @@ static struct ata_port_operations sas_sata_ops = { }; static struct ata_port_info sata_port_info = { - .flags = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ, + .flags = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ | + ATA_FLAG_SAS_HOST, .pio_mask = ATA_PIO4, .mwdma_mask = ATA_MWDMA2, .udma_mask = ATA_UDMA6, |