James, > No, my tree builds ... or at least the ufs-mcq.c part of it (I checked > after I got the merge conflict ... although only with the default > configuration). I am not questioning that your tree builds. But your for-next branch contains UFS code not present in the SCSI tree, effectively reverting my conflict resolution. -- Martin K. Petersen Oracle Linux Engineering
