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

2021-04-07 Thread Roman Bolshakov
On Wed, Apr 07, 2021 at 05:04:57PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the scsi tree got a conflict in: > > drivers/target/iscsi/iscsi_target.c > > between commit: > > 0352c3d3959a ("scsi: target: iscsi: Fix zero tag inside a trace event") > > from the

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

2021-04-07 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the scsi tree got a conflict in: drivers/target/iscsi/iscsi_target.c between commit: 0352c3d3959a ("scsi: target: iscsi: Fix zero tag inside a trace event") from the scsi-fixes tree and commit: 08694199477d ("scsi: target: core: Add gfp_t arg to

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

2019-08-16 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the scsi tree got a conflict in: drivers/scsi/qla2xxx/qla_os.c between commit: 26fa656e9a0c ("scsi: qla2xxx: Fix gnl.l memory leak on adapter init failure") from the scsi-fixes tree and commit: 26a77799195f ("scsi: qla2xxx: Correct error handling

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

2019-01-13 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the scsi tree got a conflict in: drivers/scsi/hisi_sas/hisi_sas_v3_hw.c between commit: 7bb25a89aad2 ("scsi: hisi_sas: Set protection parameters prior to adding SCSI host") from the scsi-fixes tree and commit: ef63464bcf8f ("scsi: hisi_sas: Create