Merge by hand (conflicts in scsi_lib.c)