Merge branch '6.12/scsi-fixes' into 6.13/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Thu, 21 Nov 2024 02:26:59 +0000 (21:26 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 21 Nov 2024 02:26:59 +0000 (21:26 -0500)
commit8e3b6345d113cc917e64b0349dc486b5d8f55e70
tree7489ad65d6f9ff43b9b251bd8828713684afafcf
parent128faa1845a2d5b0178b986f3bd18fb38cc08cc2
parent54c814c8b23bc7617be3d46abdb896937695dbfa
Merge branch '6.12/scsi-fixes' into 6.13/scsi-staging

Pull in the fixes branch to resolve conflict in UFS core.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/ufs/core/ufshcd.c