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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1430 bytes --]

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 root and device debugfs directories")

from the scsi tree.

I fixed it up (see below) 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

diff --cc drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index c92b3822c408,b780b5269f0f..000000000000
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@@ -2507,12 -2672,9 +2672,15 @@@ hisi_sas_v3_probe(struct pci_dev *pdev
  		sha->sas_port[i] = &hisi_hba->port[i].sas_port;
  	}
  
 +	if (hisi_hba->prot_mask) {
 +		dev_info(dev, "Registering for DIF/DIX prot_mask=0x%x\n",
 +			 prot_mask);
 +		scsi_host_set_prot(hisi_hba->shost, prot_mask);
 +	}
 +
+ 	if (hisi_sas_debugfs_enable)
+ 		hisi_sas_debugfs_init(hisi_hba);
+ 
  	rc = scsi_add_host(shost, dev);
  	if (rc)
  		goto err_out_ha;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[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 scsi-fixes tree and commit:
> 
>   08694199477d ("scsi: target: core: Add gfp_t arg to target_cmd_init_cdb()")
> 
> from the scsi tree.
> 
> I fixed it up (see below) 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.
> 

Hi Stephen,

I'm sorry for not mentioning the issue. IIRC I sent 0352c3d3959a off
linus/master, because 5.12/scsi-fixes was quite behind it. I have to say
that for this particular fix I didn't try to apply it to 5.13/scsi-queue
because I didn't expect any conflicts for such a small change :)

I will apply to both <next>/scsi-queue and <current>/scsi-fixes next
time before submission even for trivial patches to avoid the confusion.

The conflict resolution is fine.

Thanks,
Roman

> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/target/iscsi/iscsi_target.c
> index e5c443bfbdf9,cf7f0465dd63..000000000000
> --- a/drivers/target/iscsi/iscsi_target.c
> +++ b/drivers/target/iscsi/iscsi_target.c
> @@@ -1166,8 -1166,8 +1166,9 @@@ int iscsit_setup_scsi_cmd(struct iscsi_
>   
>   	target_get_sess_cmd(&cmd->se_cmd, true);
>   
>  +	cmd->se_cmd.tag = (__force u32)cmd->init_task_tag;
> - 	cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb);
> + 	cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb,
> + 						GFP_KERNEL);
>   	if (cmd->sense_reason) {
>   		if (cmd->sense_reason == TCM_OUT_OF_RESOURCES) {
>   			return iscsit_add_reject_cmd(cmd,

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1410 bytes --]

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 target_cmd_init_cdb()")

from the scsi tree.

I fixed it up (see below) 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

diff --cc drivers/target/iscsi/iscsi_target.c
index e5c443bfbdf9,cf7f0465dd63..000000000000
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@@ -1166,8 -1166,8 +1166,9 @@@ int iscsit_setup_scsi_cmd(struct iscsi_
  
  	target_get_sess_cmd(&cmd->se_cmd, true);
  
 +	cmd->se_cmd.tag = (__force u32)cmd->init_task_tag;
- 	cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb);
+ 	cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb,
+ 						GFP_KERNEL);
  	if (cmd->sense_reason) {
  		if (cmd->sense_reason == TCM_OUT_OF_RESOURCES) {
  			return iscsit_add_reject_cmd(cmd,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1326 bytes --]

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 during initialization failures")

from the scsi tree.

I fixed it up (see below) 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

diff --cc drivers/scsi/qla2xxx/qla_os.c
index 98e60a34afd9,7d73b6a7cf41..000000000000
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@@ -4824,8 -4802,7 +4810,8 @@@ struct scsi_qla_host *qla2x00_create_ho
  		    "Alloc failed for scan database.\n");
  		dma_free_coherent(&ha->pdev->dev, vha->gnl.size,
  		    vha->gnl.l, vha->gnl.ldma);
 +		vha->gnl.l = NULL;
- 		scsi_remove_host(vha->host);
+ 		scsi_host_put(vha->host);
  		return NULL;
  	}
  	INIT_DELAYED_WORK(&vha->scan.scan_work, qla_scan_work_fn);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]