Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d9b57fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] qla2xxx: Update version number to 8.02.01-k4.
  [SCSI] qla2xxx: Correct handling of AENs postings for vports.
  [SCSI] qla2xxx: Revert "qla2xxx: Use proper HA during asynchronous event handling."
  [SCSI] ibmvscsi: Non SCSI error status fixup
  [SCSI] fusion mpt: fix target missing after resetting external raid
  [SCSI] fix intermittent oops in scsi_bus_uevent
  [SCSI] qla2xxx: Update version number to 8.02.01-k3.
  [SCSI] qla2xxx: Revert "qla2xxx: Validate mid-layer 'underflow' during check-condition handling."
  [SCSI] qla2xxx: Disable local-interrupts while polling for RISC status.
  [SCSI] qla2xxx: Extend the 'fw_dump' SYSFS node the ability to initiate a firmware dump.
  [SCSI] qla2xxx: Don't depend on mailbox return values while enabling FCE tracing.
  [SCSI] qla2xxx: Convert vport_sem to a mutex
  [SCSI] qla2xxx: firmware semaphore to mutex
  [SCSI] qla2xxx: Correct locking within MSI-X interrupt handlers.
  [SCSI] qla2xxx: Display driver version at module init-time.
  [SCSI] qla2xxx: Return correct port_type to FC-transport for Vports.
parents df6ab559 28d7647d

drivers/message/fusion/mptfc.c

+0 −2
Original line number Diff line number Diff line
@@ -1238,8 +1238,6 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	sh->max_id = ioc->pfacts->MaxDevices;

	sh->max_lun = max_lun;



	sh->this_id = ioc->pfacts[0].PortSCSIID;



	/* Required entry.

	 */

	sh->unique_id = ioc->id;

drivers/message/fusion/mptsas.c

+0 −2
Original line number Diff line number Diff line
@@ -3193,8 +3193,6 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	sh->transportt = mptsas_transport_template;



	sh->this_id = ioc->pfacts[0].PortSCSIID;



	/* Required entry.

	 */

	sh->unique_id = ioc->id;

drivers/message/fusion/mptscsih.c

+0 −8
Original line number Diff line number Diff line
@@ -2451,12 +2451,6 @@ mptscsih_slave_configure(struct scsi_device *sdev) 
		    ioc->name, sdev->sdtr, sdev->wdtr,

		    sdev->ppr, sdev->inquiry_len));



	if (sdev->id > sh->max_id) {

		/* error case, should never happen */

		scsi_adjust_queue_depth(sdev, 0, 1);

		goto slave_configure_exit;

	}



	vdevice->configured_lun = 1;

	mptscsih_change_queue_depth(sdev, MPT_SCSI_CMD_PER_DEV_HIGH);
@@ -2470,8 +2464,6 @@ mptscsih_slave_configure(struct scsi_device *sdev) 
		    ioc->name, vtarget->negoFlags, vtarget->maxOffset,

		    vtarget->minSyncFactor));



slave_configure_exit:



	dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT

		"tagged %d, simple %d, ordered %d\n",

		ioc->name,sdev->tagged_supported, sdev->simple_tags,

drivers/scsi/ibmvscsi/ibmvscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1348,7 +1348,7 @@ void ibmvscsi_handle_crq(struct viosrp_crq *crq, 


	del_timer(&evt_struct->timer);



	if (crq->status != VIOSRP_OK && evt_struct->cmnd)

	if ((crq->status != VIOSRP_OK && crq->status != VIOSRP_OK2) && evt_struct->cmnd)

		evt_struct->cmnd->result = DID_ERROR << 16;

	if (evt_struct->done)

		evt_struct->done(evt_struct);

drivers/scsi/ibmvscsi/viosrp.h

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ enum viosrp_crq_status { 
	VIOSRP_VIOLATES_MAX_XFER = 0x2,

	VIOSRP_PARTNER_PANIC = 0x3,

	VIOSRP_DEVICE_BUSY = 0x8,

	VIOSRP_ADAPTER_FAIL = 0x10

	VIOSRP_ADAPTER_FAIL = 0x10,

	VIOSRP_OK2 = 0x99,

};



struct viosrp_crq {