mirror of
https://github.com/torvalds/linux.git
synced 2026-05-06 23:35:26 -04:00
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>