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

[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 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: pgpL0htPVHdlJ.pgp
Description: OpenPGP digital signature