projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 857a80b 5cd0f6f)
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)
commit84b20b8062e76a0290aee7360c8238df681c106e
tree9716475914c1a7caaca229a25b8aa0f2a2c52221tree | snapshot
parent857a80bbd7321161f986588160d97815d1b1206acommit | diff
parent5cd0f6f57639c5afbb36100c69281fee82c95ee7commit | diff
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 diff1 | diff2 | blob | history
drivers/scsi/ufs/ufshcd.c diff1 | diff2 | blob | history
drivers/target/iscsi/iscsi_target.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git