Request to backport commit id: 15924b0503630016dee4dbb945a8df4df659070b to 6.5/scsi-fixes