Martin Wilck <mwilck@xxxxxxxx> writes: Martin, > I noticed that the following commits > > eb94588dabec scsi: hpsa: fix volume offline state > 2ef288498087 scsi: hpsa: do not timeout reset operations > 87b9e6aa87d9 scsi: hpsa: limit outstanding rescans > 85b29008d8af scsi: hpsa: update check for logical volume status > > are included in mkp/4.11/scsi-fixes but not in mkp/4.12/scsi-queue. > Is there a specific reason for that? scsi-fixes and scsi-queue are usually forked from linus/master at the about same time after the merge window closes. - Bugfixes for the current release go into scsi-fixes. - New features for next release go into scsi-queue. Consequently, it's perfectly normal for fixes to be more "recent" than queue. I only rebase the queue if I absolutely have to (i.e. a new feature depends on something that happened in Linus' tree after the merge window closed). -- Martin K. Petersen Oracle Linux Engineering
