]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Tue, 13 Apr 2021 01:41:54 +0000 (21:41 -0400)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 13 Apr 2021 01:41:54 +0000 (21:41 -0400)
commit17616bcd0cbf89a9eac7217b618563af5e4232a2
tree9716475914c1a7caaca229a25b8aa0f2a2c52221
parent62333b2e4665646cfee6fdd86d7519f55e2e0acf
parenta25fc4682c232364bda0c546f1dbed2295a1c54e
Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging

Resolve a couple of conflicts between the 5.12 fixes branch and the
5.13 staging tree (iSCSI target and UFS).

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/pm8001/pm8001_hwi.c
drivers/scsi/ufs/ufshcd.c
drivers/target/iscsi/iscsi_target.c