| commit | 5db733474cc1782a2dec9cd40ca92721c806cd23 | [log] [tgz] |
|---|---|---|
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | Wed Mar 06 21:50:04 2019 -0800 |
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | Wed Mar 06 21:50:04 2019 -0800 |
| tree | 79c27a61d70ae67c57165c9d59f8465c682474b8 | |
| parent | f90d64483ebd394958841f67f8794ab203b319a7 [diff] | |
| parent | 26af1a368e40618d67956b1f883fbcfec292c5d8 [diff] |
Merge branch 'misc' into for-next Conflicts: drivers/scsi/arcmsr/arcmsr_hba.c drivers/scsi/hisi_sas/hisi_sas_v3_hw.c drivers/scsi/lpfc/lpfc_nvme.c drivers/scsi/qla2xxx/qla_init.c