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

Commit 42604831 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: (60 commits)
  [SCSI] lpfc 8.3.24: Extend BSG infrastructure and add link diagnostics
  [SCSI] lpfc 8.3.24: Add resource extent support
  [SCSI] lpfc 8.3.24: Add request-firmware support
  [SCSI] lpfc 8.3.24: Add SR-IOV control
  [SCSI] lpfc 8.3.24: Extended hardware support and support dump images
  [SCSI] lpfc 8.3.24: Miscellaneous Fixes and Corrections
  [SCSI] libsas: Add option for SATA soft reset
  [SCSI] libsas: check dev->gone before submitting sata i/o
  [SCSI] libsas: fix/amend device gone notification in sas_deform_port()
  [SCSI] MAINTAINERS update for SCSI (new email address)
  [SCSI] Fix Ultrastor asm snippet
  [SCSI] osst: fix warning
  [SCSI] osst: wrong index used in inner loop
  [SCSI] aic94xx: world-writable sysfs update_bios file
  [SCSI] MAINTAINERS: Add drivers/target/ entry
  [SCSI] target: Convert TASK_ATTR to scsi_tcq.h definitions
  [SCSI] target: Convert REPORT_LUNs to use int_to_scsilun
  [SCSI] target: Fix task->task_execute_queue=1 clear bug + LUN_RESET OOPs
  [SCSI] target: Fix bug with task_sg chained transport_free_dev_tasks release
  [SCSI] target: Fix interrupt context bug with stats_lock and core_tmr_alloc_req
  ...
parents 2a56d222 7ad20aa9

Documentation/scsi/ChangeLog.megaraid_sas

+14 −0
Original line number Diff line number Diff line 
Release Date    : Wed. May 11, 2011 17:00:00 PST 2010 -

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford

Current Version : 00.00.05.38-rc1

Old Version     : 00.00.05.34-rc1

    1. Remove MSI-X black list, use MFI_REG_STATE.ready.msiEnable.

    2. Remove un-used function megasas_return_cmd_for_smid().

    3. Check MFI_REG_STATE.fault.resetAdapter in megasas_reset_fusion().

    4. Disable interrupts/free_irq() in megasas_shutdown().

    5. Fix bug where AENs could be lost in probe() and resume().

    6. Convert 6,10,12 byte CDB's to 16 byte CDB for large LBA's for FastPath

       IO.

    7. Add 1078 OCR support.

-------------------------------------------------------------------------------

Release Date    : Thu. Feb 24, 2011 17:00:00 PST 2010 -

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford

MAINTAINERS

+12 −1
Original line number Diff line number Diff line
@@ -5515,7 +5515,7 @@ F: drivers/scsi/sg.c 
F:	include/scsi/sg.h



SCSI SUBSYSTEM

M:	"James E.J. Bottomley" <James.Bottomley@suse.de>

M:	"James E.J. Bottomley" <JBottomley@parallels.com>

L:	linux-scsi@vger.kernel.org

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

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
@@ -6084,6 +6084,17 @@ F: Documentation/filesystems/sysv-fs.txt 
F:	fs/sysv/

F:	include/linux/sysv_fs.h



TARGET SUBSYSTEM

M:	Nicholas A. Bellinger <nab@linux-iscsi.org>

L:	linux-scsi@vger.kernel.org

L:	http://groups.google.com/group/linux-iscsi-target-dev

W:	http://www.linux-iscsi.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master

S:	Supported

F:	drivers/target/

F:	include/target/

F:	Documentation/target/



TASKSTATS STATISTICS INTERFACE

M:	Balbir Singh <balbir@linux.vnet.ibm.com>

S:	Maintained

drivers/scsi/aic94xx/aic94xx_init.c

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(struct device *dev, 
			flash_error_table[i].reason);

}



static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUGO,

static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUSR,

	asd_show_update_bios, asd_store_update_bios);



static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)

drivers/scsi/bfa/bfa_ioc.c

+3 −1
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ BFA_TRC_FILE(CNA, IOC); 
#define bfa_ioc_map_port(__ioc) ((__ioc)->ioc_hwif->ioc_map_port(__ioc))

#define bfa_ioc_notify_fail(__ioc)              \

			((__ioc)->ioc_hwif->ioc_notify_fail(__ioc))

#define bfa_ioc_sync_start(__ioc)               \

			((__ioc)->ioc_hwif->ioc_sync_start(__ioc))

#define bfa_ioc_sync_join(__ioc)                \

			((__ioc)->ioc_hwif->ioc_sync_join(__ioc))

#define bfa_ioc_sync_leave(__ioc)               \
@@ -647,7 +649,7 @@ bfa_iocpf_sm_fwcheck(struct bfa_iocpf_s *iocpf, enum iocpf_event event) 
	switch (event) {

	case IOCPF_E_SEMLOCKED:

		if (bfa_ioc_firmware_lock(ioc)) {

			if (bfa_ioc_sync_complete(ioc)) {

			if (bfa_ioc_sync_start(ioc)) {

				iocpf->retry_count = 0;

				bfa_ioc_sync_join(ioc);

				bfa_fsm_set_state(iocpf, bfa_iocpf_sm_hwinit);

drivers/scsi/bfa/bfa_ioc.h

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ struct bfa_ioc_hwif_s { 
					bfa_boolean_t msix);

	void		(*ioc_notify_fail)	(struct bfa_ioc_s *ioc);

	void		(*ioc_ownership_reset)	(struct bfa_ioc_s *ioc);

	bfa_boolean_t   (*ioc_sync_start)       (struct bfa_ioc_s *ioc);

	void		(*ioc_sync_join)	(struct bfa_ioc_s *ioc);

	void		(*ioc_sync_leave)	(struct bfa_ioc_s *ioc);

	void		(*ioc_sync_ack)		(struct bfa_ioc_s *ioc);