4d82e9db42
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> |
||
---|---|---|
.. | ||
ibmvfc.c | ||
ibmvfc.h | ||
ibmvscsi.c | ||
ibmvscsi.h | ||
Makefile |