Commit c29c08b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (28 commits)
  [SCSI] qla4xxx: fix compilation warning
  [SCSI] make error handling more robust in the face of reservations
  [SCSI] tgt: fix warning
  [SCSI] drivers/message/fusion: Adjust confusing if indentation
  [SCSI] Return NEEDS_RETRY for eh commands with status BUSY
  [SCSI] ibmvfc: Driver version 1.0.9
  [SCSI] ibmvfc: Fix terminate_rport_io
  [SCSI] ibmvfc: Fix rport add/delete race resulting in oops
  [SCSI] lpfc 8.3.16: Change LPFC driver version to 8.3.16
  [SCSI] lpfc 8.3.16: FCoE Discovery and Failover Fixes
  [SCSI] lpfc 8.3.16: SLI Additions, updates, and code cleanup
  [SCSI] pm8001: introduce missing kfree
  [SCSI] qla4xxx: Update driver version to 5.02.00-k3
  [SCSI] qla4xxx: Added AER support for ISP82xx
  [SCSI] qla4xxx: Handle outstanding mbx cmds on hung f/w scenarios
  [SCSI] qla4xxx: updated mbx_sys_info struct to sync with FW 4.6.x
  [SCSI] qla4xxx: clear AF_DPC_SCHEDULED flage when exit from do_dpc
  [SCSI] qla4xxx: Stop firmware before doing init firmware.
  [SCSI] qla4xxx: Use the correct request queue.
  [SCSI] qla4xxx: set correct value in sess->recovery_tmo
  ...
parents bbbfb910 3c3e2108

drivers/firmware/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -122,14 +122,6 @@ config ISCSI_IBFT_FIND 
	  is necessary for iSCSI Boot Firmware Table Attributes module to work

	  properly.



config ISCSI_BOOT_SYSFS

	tristate "iSCSI Boot Sysfs Interface"

	default	n

	help

	  This option enables support for exposing iSCSI boot information

	  via sysfs to userspace. If you wish to export this information,

	  say Y. Otherwise, say N.



config ISCSI_IBFT

	tristate "iSCSI Boot Firmware Table Attributes module"

	select ISCSI_BOOT_SYSFS

drivers/firmware/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,5 +10,4 @@ obj-$(CONFIG_DCDBAS) += dcdbas.o 
obj-$(CONFIG_DMIID)		+= dmi-id.o

obj-$(CONFIG_ISCSI_IBFT_FIND)	+= iscsi_ibft_find.o

obj-$(CONFIG_ISCSI_IBFT)	+= iscsi_ibft.o

obj-$(CONFIG_ISCSI_BOOT_SYSFS)	+= iscsi_boot_sysfs.o

obj-$(CONFIG_FIRMWARE_MEMMAP)	+= memmap.o

drivers/scsi/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -370,6 +370,14 @@ config ISCSI_TCP 


	 http://open-iscsi.org



config ISCSI_BOOT_SYSFS

	tristate "iSCSI Boot Sysfs Interface"

	default	n

	help

	  This option enables support for exposing iSCSI boot information

	  via sysfs to userspace. If you wish to export this information,

	  say Y. Otherwise, say N.



source "drivers/scsi/cxgb3i/Kconfig"

source "drivers/scsi/bnx2i/Kconfig"

source "drivers/scsi/be2iscsi/Kconfig"

drivers/scsi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ obj-$(CONFIG_FCOE) += fcoe/ 
obj-$(CONFIG_FCOE_FNIC)		+= fnic/

obj-$(CONFIG_ISCSI_TCP) 	+= libiscsi.o	libiscsi_tcp.o iscsi_tcp.o

obj-$(CONFIG_INFINIBAND_ISER) 	+= libiscsi.o

obj-$(CONFIG_ISCSI_BOOT_SYSFS)	+= iscsi_boot_sysfs.o

obj-$(CONFIG_SCSI_A4000T)	+= 53c700.o	a4000t.o

obj-$(CONFIG_SCSI_ZORRO7XX)	+= 53c700.o	zorro7xx.o

obj-$(CONFIG_A3000_SCSI)	+= a3000.o	wd33c93.o

drivers/scsi/be2iscsi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config BE2ISCSI 
	tristate "ServerEngines' 10Gbps iSCSI - BladeEngine 2"

	depends on PCI && SCSI && NET

	select SCSI_ISCSI_ATTRS

	select ISCSI_BOOT_SYSFS



	help

	This driver implements the iSCSI functionality for ServerEngines'

CRA Git | Maintained and supported by SUSTech CRA and CCSE