I'll wait until the modified patch reaches mkp/queue, and update the patch in master / stable then. It only fixes a SCSI corner case (bug 491289), but we don't want to miss it in future releases.