| commit | 4d82e9db422ec34793650a34c5f03edd7b0abbaf | [log] [tgz] |
|---|---|---|
| author | Martin K. Petersen <martin.petersen@oracle.com> | Tue Jan 26 21:36:54 2021 -0500 |
| committer | Martin K. Petersen <martin.petersen@oracle.com> | Tue Jan 26 21:52:58 2021 -0500 |
| tree | 59a8eda6e6f11f6226c5910c6f41695b964ca03e | |
| parent | 18c05faf8ab14913c8144108661efa8f17b10b5b [diff] | |
| parent | aa2c24e7f415e9c13635cee22ff4e15a80215551 [diff] |
Merge branch '5.11/scsi-fixes' into 5.12/scsi-queue The UFS core has received a substantial rework this cycle. This in turn has caused a merge conflict in linux-next. Merge 5.11/scsi-fixes into 5.12/scsi-queue and resolve the conflict. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>