mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-02-11 06:16:10 +00:00
![James Bottomley](/assets/img/avatar_default.png)
Conflicts: drivers/scsi/scsi_debug.c Agreed and tested resolution to a merge problem between a fix in scsi_debug and a driver update Signed-off-by: James Bottomley <JBottomley@Parallels.com>