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

Commit 365bbe0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (30 commits)
  [SCSI] qla1280: set residual correctly
  [SCSI] fusion: bump version
  [SCSI] fusion: MODULE_VERSION support
  [SCSI] fusion: power pc and miscellaneous bug fixs
  [SCSI] fusion: fibre channel: return DID_ERROR for MPI_IOCSTATUS_SCSI_IOC_TERMINATED
  [SCSI] megaraid_sas: Update module author
  [SCSI] 3ware 8000 serialize reset code
  [SCSI] sr: fix error code check in sr_block_ioctl()
  [SCSI] scsi: lpfc error path fix
  [SCSI] aacraid: Product List Update
  [SCSI] libiscsi: fix senselen calculation
  [SCSI] iscsi: simplify IPv6 and IPv4 address printing
  [SCSI] iscsi: newline in printk
  [SCSI] iscsi: fix crypto_alloc_hash() error check
  [SCSI] iscsi: fix 2.6.19 data digest calculation bug
  [SCSI] scsi_scan: fix report lun problems with CDROM or RBC devices
  [SCSI] qla2xxx: Update version number to 8.01.07-k4.
  [SCSI] qla2xxx: Use generic isp_ops.fw_dump() function.
  [SCSI] qla2xxx: Perform a fw-dump when an ISP23xx RISC-paused state is detected.
  [SCSI] qla2xxx: Correct reset handling logic.
  ...
parents 0bf98542 3ef49a3b

Documentation/scsi/aacraid.txt

+38 −28
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ the original). 
Supported Cards/Chipsets

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

	PCI ID (pci.ids)	OEM	Product

	9005:0283:9005:0283	Adaptec	Catapult (3210S with arc firmware)

	9005:0284:9005:0284	Adaptec	Tomcat (3410S with arc firmware)

	9005:0285:9005:0285	Adaptec	2200S (Vulcan)

	9005:0285:9005:0286	Adaptec	2120S (Crusader)

	9005:0285:9005:0287	Adaptec	2200S (Vulcan-2m)
@@ -30,24 +28,25 @@ Supported Cards/Chipsets 
	9005:0285:9005:0293	Adaptec	21610SA (Corsair-16)

	9005:0285:9005:0296	Adaptec	2240S (SabreExpress)

	9005:0285:9005:0292	Adaptec	2810SA (Corsair-8)

	9005:0285:9005:0294	Adaptec	Prowler

	9005:0285:9005:0297	Adaptec	4005SAS (AvonPark)

	9005:0285:9005:0298	Adaptec	4000SAS (BlackBird)

	9005:0285:9005:0297	Adaptec	4005 (AvonPark)

	9005:0285:9005:0298	Adaptec	4000 (BlackBird)

	9005:0285:9005:0299	Adaptec	4800SAS (Marauder-X)

	9005:0285:9005:029a	Adaptec	4805SAS (Marauder-E)

	9005:0286:9005:029b	Adaptec	2820SA (Intruder)

	9005:0286:9005:029c	Adaptec	2620SA (Intruder)

	9005:0286:9005:029d	Adaptec	2420SA (Intruder HP release)

	9005:0286:9005:02a2	Adaptec	3800SAS (Hurricane44)

	9005:0286:9005:02a7	Adaptec	3805SAS (Hurricane80)

	9005:0286:9005:02a8	Adaptec	3400SAS (Hurricane40)

	9005:0286:9005:02ac	Adaptec	1800SAS (Typhoon44)

	9005:0286:9005:02b3	Adaptec	2400SAS (Hurricane40lm)

	9005:0285:9005:02b5	Adaptec ASR5800 (Voodoo44)

	9005:0285:9005:02b6	Adaptec ASR5805 (Voodoo80)

	9005:0285:9005:02b7	Adaptec ASR5808 (Voodoo08)

	9005:0286:9005:02ac	Adaptec	1800 (Typhoon44)

	9005:0285:9005:02b5	Adaptec	5445 (Voodoo44)

	9005:0285:9005:02b6	Adaptec	5805 (Voodoo80)

	9005:0285:9005:02b7	Adaptec	5085 (Voodoo08)

	9005:0285:9005:02bb	Adaptec	3405 (Marauder40LP)

	9005:0285:9005:02bc	Adaptec	3805 (Marauder80LP)

	9005:0285:9005:02c7	Adaptec	3085 (Marauder08ELP)

	9005:0285:9005:02bd	Adaptec	31205 (Marauder120)

	9005:0285:9005:02be	Adaptec	31605 (Marauder160)

	9005:0285:9005:02c3	Adaptec	51205 (Voodoo120)

	9005:0285:9005:02c4	Adaptec	51605 (Voodoo160)

	1011:0046:9005:0364	Adaptec	5400S (Mustang)

	1011:0046:9005:0365	Adaptec	5400S (Mustang)

	9005:0287:9005:0800	Adaptec	Themisto (Jupiter)

	9005:0200:9005:0200	Adaptec	Themisto (Jupiter)

	9005:0286:9005:0800	Adaptec	Callisto (Jupiter)
@@ -68,21 +67,32 @@ Supported Cards/Chipsets 
	9005:0285:17aa:0287	Legend	S230 (Vulcan)

	9005:0285:9005:0290	IBM	ServeRAID 7t (Jaguar)

	9005:0285:1014:02F2	IBM	ServeRAID 8i (AvonPark)

	9005:0285:1014:0312	IBM	ServeRAID 8i (AvonParkLite)

	9005:0286:1014:9540	IBM	ServeRAID 8k/8k-l4 (AuroraLite)

	9005:0286:1014:9580	IBM	ServeRAID 8k/8k-l8 (Aurora)

	9005:0286:1014:034d	IBM	ServeRAID 8s (Hurricane)

	9005:0286:9005:029e	ICP	ICP9024R0 (Lancer)

	9005:0286:9005:029f	ICP	ICP9014R0 (Lancer)

	9005:0285:1014:034d	IBM	ServeRAID 8s (Marauder-E)

	9005:0286:9005:029e	ICP	ICP9024RO (Lancer)

	9005:0286:9005:029f	ICP	ICP9014RO (Lancer)

	9005:0286:9005:02a0	ICP	ICP9047MA (Lancer)

	9005:0286:9005:02a1	ICP	ICP9087MA (Lancer)

	9005:0286:9005:02a3	ICP	ICP5445AU (Hurricane44)

	9005:0286:9005:02a4	ICP	ICP9085LI (Marauder-X)

	9005:0286:9005:02a5	ICP	ICP5085BR (Marauder-E)

	9005:0285:9005:02a4	ICP	ICP9085LI (Marauder-X)

	9005:0285:9005:02a5	ICP	ICP5085BR (Marauder-E)

	9005:0286:9005:02a6	ICP	ICP9067MA (Intruder-6)

	9005:0286:9005:02a9	ICP	ICP5085AU (Hurricane80)

	9005:0286:9005:02aa	ICP	ICP5045AU (Hurricane40)

	9005:0286:9005:02b4	ICP	ICP5045AL (Hurricane40lm)

	9005:0285:9005:02b2	ICP	(Voodoo 8 internal 8 external)

	9005:0285:9005:02b8	ICP	ICP5445SL (Voodoo44)

	9005:0285:9005:02b9	ICP	ICP5085SL (Voodoo80)

	9005:0285:9005:02ba	ICP	ICP5805SL (Voodoo08)

	9005:0285:9005:02bf	ICP	ICP5045BL (Marauder40LP)

	9005:0285:9005:02c0	ICP	ICP5085BL (Marauder80LP)

	9005:0285:9005:02c8	ICP	ICP5805BL (Marauder08ELP)

	9005:0285:9005:02c1	ICP	ICP5125BR (Marauder120)

	9005:0285:9005:02c2	ICP	ICP5165BR (Marauder160)

	9005:0285:9005:02c5	ICP	ICP5125SL (Voodoo120)

	9005:0285:9005:02c6	ICP	ICP5165SL (Voodoo160)

	9005:0286:9005:02ab		(Typhoon40)

	9005:0286:9005:02ad		(Aurora ARK)

	9005:0286:9005:02ae		(Aurora Lite ARK)

	9005:0285:9005:02b0		(Sunrise Lake ARK)

	9005:0285:9005:02b1	Adaptec	(Voodoo 8 internal 8 external)



People

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

drivers/message/fusion/mptbase.c

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *      For use with LSI Logic PCI chip/adapter(s)

 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.

 *

 *  Copyright (c) 1999-2005 LSI Logic Corporation

 *  Copyright (c) 1999-2007 LSI Logic Corporation

 *  (mailto:mpt_linux_developer@lsil.com)

 *

 */
@@ -73,6 +73,7 @@ 
MODULE_AUTHOR(MODULEAUTHOR);

MODULE_DESCRIPTION(my_NAME);

MODULE_LICENSE("GPL");

MODULE_VERSION(my_VERSION);



/*

 *  cmd line parameters

drivers/message/fusion/mptbase.h

+5 −5
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *          LSIFC9xx/LSI409xx Fibre Channel

 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.

 *

 *  Copyright (c) 1999-2005 LSI Logic Corporation

 *  Copyright (c) 1999-2007 LSI Logic Corporation

 *  (mailto:mpt_linux_developer@lsil.com)

 *

 */
@@ -72,11 +72,11 @@ 
#endif



#ifndef COPYRIGHT

#define COPYRIGHT	"Copyright (c) 1999-2005 " MODULEAUTHOR

#define COPYRIGHT	"Copyright (c) 1999-2007 " MODULEAUTHOR

#endif



#define MPT_LINUX_VERSION_COMMON	"3.04.02"

#define MPT_LINUX_PACKAGE_NAME		"@(#)mptlinux-3.04.02"

#define MPT_LINUX_VERSION_COMMON	"3.04.03"

#define MPT_LINUX_PACKAGE_NAME		"@(#)mptlinux-3.04.03"

#define WHAT_MAGIC_STRING		"@" "(" "#" ")"



#define show_mptmod_ver(s,ver)  \
@@ -1059,7 +1059,7 @@ extern int mpt_stm_index; /* needed by mptstm.c */ 
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

#endif		/* } __KERNEL__ */



#if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || defined(__x86_64__)

#if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || defined(__x86_64__) || defined(__powerpc__)

#define CAST_U32_TO_PTR(x)	((void *)(u64)x)

#define CAST_PTR_TO_U32(x)	((u32)(u64)x)

#else

drivers/message/fusion/mptctl.c

+3 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 *      For use with LSI Logic PCI chip/adapters

 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.

 *

 *  Copyright (c) 1999-2005 LSI Logic Corporation

 *  Copyright (c) 1999-2007 LSI Logic Corporation

 *  (mailto:mpt_linux_developer@lsil.com)

 *

 */
@@ -66,7 +66,7 @@ 
#include <scsi/scsi_host.h>

#include <scsi/scsi_tcq.h>



#define COPYRIGHT	"Copyright (c) 1999-2005 LSI Logic Corporation"

#define COPYRIGHT	"Copyright (c) 1999-2007 LSI Logic Corporation"

#define MODULEAUTHOR	"LSI Logic Corporation"

#include "mptbase.h"

#include "mptctl.h"
@@ -79,6 +79,7 @@ 
MODULE_AUTHOR(MODULEAUTHOR);

MODULE_DESCRIPTION(my_NAME);

MODULE_LICENSE("GPL");

MODULE_VERSION(my_VERSION);



/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

drivers/message/fusion/mptctl.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *          LSIFC9xx/LSI409xx Fibre Channel

 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.

 *

 *  Copyright (c) 1999-2005 LSI Logic Corporation

 *  Copyright (c) 1999-2007 LSI Logic Corporation

 *  (mailto:mpt_linux_developer@lsil.com)

 *

 */