Re: linux-next: manual merge of the scsi-mkp tree with the scsi tree

2018-01-25 Thread James Bottomley
On Fri, 2018-01-26 at 09:39 +1100, Stephen Rothwell wrote: > Hi Martin, > > Today's linux-next merge of the scsi-mkp tree got a conflict in: > >   drivers/scsi/qla2xxx/qla_init.c > > between commit: > >   07a21872cf2b ("scsi: qla2xxx: Fix queue ID for async abort with > Multiqueue") > > from t

linux-next: manual merge of the scsi-mkp tree with the scsi tree

2018-01-25 Thread Stephen Rothwell
Hi Martin, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/qla2xxx/qla_init.c between commit: 07a21872cf2b ("scsi: qla2xxx: Fix queue ID for async abort with Multiqueue") from the scsi tree and commit: b027a5ace443 ("scsi: qla2xxx: Fix queue ID for async ab

linux-next: manual merge of the scsi-mkp tree with the scsi tree

2016-11-08 Thread Stephen Rothwell
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)