From: Martin K. Petersen Date: Fri, 30 Dec 2022 16:31:44 +0000 (+0000) Subject: Merge branch '6.2/mpt-mpi' into 6.2/scsi-fixes X-Git-Tag: microblaze-v6.6~1273^2~12 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=a1c7a7cde6c92e42eb2cc8a04a9529c3fe8f19c8;p=linux-2.6-microblaze.git 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 --- a1c7a7cde6c92e42eb2cc8a04a9529c3fe8f19c8