diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2022-12-30 19:31:44 +0300 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-12-30 19:31:44 +0300 |
commit | a1c7a7cde6c92e42eb2cc8a04a9529c3fe8f19c8 (patch) | |
tree | 7821bf5045ceaccc44d9142042f0f3c2ffc247fb /drivers/scsi/hisi_sas | |
parent | 6b1c374c45605504ed32e855c4e0f9b652a1978e (diff) | |
parent | d347a951906b506c485ee9ffb76fe473b41f3e10 (diff) | |
download | linux-a1c7a7cde6c92e42eb2cc8a04a9529c3fe8f19c8.tar.xz |
Merge branch '6.2/mpt-mpi' into 6.2/scsi-fixes
Pull in Broadcom MPI/MPT fixes that conflicted with patch resolution
upstream.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/hisi_sas')
0 files changed, 0 insertions, 0 deletions