mirror of
https://github.com/torvalds/linux.git
synced 2026-01-25 15:03:52 +08:00
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>