>>>>> "Stephen" == Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes: Stephen, Stephen> This latter commit also exists as commit 2266d5678ad1 in the Stephen> scsi tree, but unfortunately, the scsi-mkp tree was rebased Stephen> overnight, so now the two patches are not the same commit :-( A Stephen> significant path of what was rebased overnight has already been Stephen> merged into the scsi tree ... so please tidy up your tree WRT Stephen> the scsi tree. This conflict would not exist if the rebase had Stephen> not been done. James' tree is usually a week or two behind mine. I almost never rebase mid-cycle but in this case we had a data corruption bug fix that went to Linus for 4.9 that a driver update depended on. In any case. It seems like the fact that the two SCSI trees may be out of sync could be an ongoing problem. So maybe you should just drop my tree again. I was just hoping to get visibility into potential merge problems sooner... -- Martin K. Petersen Oracle Linux Engineering -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
