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

2017-07-02 Thread Stephen Rothwell
Hi all, On Mon, 3 Jul 2017 15:56:58 +1000 Stephen Rothwell wrote: > > @@@ -1919,14 -1869,16 +1897,18 @@@ > } > memset(mcmd, 0, sizeof(*mcmd)); > > +cmd = container_of(se_cmd, struct qla_tgt_cmd, se_cmd); That line should not be there. -- Cheers, Stephen Rothwell

linux-next: manual merge of the target-updates tree with the scsi tree

2017-07-02 Thread Stephen Rothwell
Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in: drivers/scsi/qla2xxx/tcm_qla2xxx.c between commit: 60a9eadb19f3 ("scsi: qla2xxx: Move target stat counters from vha to qpair.") from the scsi tree and commit: bc1bb269ef7b ("qla2xxx: Fix incorrect tcm_ql

linux-next: manual merge of the target-updates tree with the scsi tree

2017-07-02 Thread Stephen Rothwell
Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in: drivers/scsi/qla2xxx/qla_target.c between commit: c5419e2618b9 ("scsi: qla2xxx: Combine Active command arrays.") from the scsi tree and commit: bc1bb269ef7b ("qla2xxx: Fix incorrect tcm_qla2xxx_free_cmd

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

2017-06-27 Thread Stephen Rothwell
Hi all, On Wed, 28 Jun 2017 15:40:59 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the target-updates tree got a conflict in: > > drivers/scsi/qla2xxx/qla_target.c > > between commits: > > f775bd14e44d ("scsi: qla2xxx: Convert 32-bit LUN usage to 64-bit") > 82de802ad46e

linux-next: manual merge of the target-updates tree with the scsi tree

2017-06-27 Thread Stephen Rothwell
Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in: drivers/scsi/qla2xxx/qla_target.c between commits: f775bd14e44d ("scsi: qla2xxx: Convert 32-bit LUN usage to 64-bit") 82de802ad46e ("scsi: qla2xxx: Preparation for Target MQ.") from the scsi tree and comm

linux-next: manual merge of the target-updates tree with the scsi tree

2014-10-02 Thread Stephen Rothwell
Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/scsi/qla2xxx/qla_target.c between commit 33e799775593 ("qla2xxx: Add support for QFull throttling and Term Exchange retry") from the scsi tree and commit 55a9066fffd2 ("qla_target: make some global functions

linux-next: manual merge of the target-updates tree with the scsi tree

2014-05-26 Thread Stephen Rothwell
Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/scsi/qla2xxx/qla_target.c between commit f83adb617f55 ("qla2xxx: T10-Dif: add T10-PI support") from the scsi tree and commit ed6849ff4921 ("qla2xxx: Convert to percpu_ida session tag pre-allocation") from th