Hi Martin, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/ufs/ufs-qcom.c Again this is caused by the rebase of the scsi-mkp tree (including commits already in the scsi tree) followed by more changes to this file. I fixed it up (I used the scsi-mkp tree version) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell -- 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
