From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Apr 2009 20:24:49 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fdb1d5096dc48f326bf130e453bdd6497e7cab4;hp=-c;p=linux-firmware

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: (74 commits)
  [SCSI] sg: fix q->queue_lock on scsi_error_handler path
  [SCSI] replace __inline with inline
  [SCSI] a2091: make 2 functions static
  [SCSI] a3000: make 2 functions static
  [SCSI] ses: #if 0 the unused ses_match_host()
  [SCSI] use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  [SCSI] sg: fix iovec bugs introduced by the block layer conversion
  [SCSI] qlogicpti: use request_firmware
  [SCSI] advansys: use request_firmware
  [SCSI] qla1280: use request_firmware
  [SCSI] libiscsi: fix iscsi pool error path
  [SCSI] cxgb3i: call ddp release function directly
  [SCSI] cxgb3i: merge cxgb3i_ddp into cxgb3i module
  [SCSI] cxgb3i: close all tcp connections upon chip reset
  [SCSI] cxgb3i: re-read ddp settings information after chip reset
  [SCSI] cxgb3i: re-initialize ddp settings after chip reset
  [SCSI] cxgb3i: subscribe to error notification from cxgb3 driver
  [SCSI] aacraid driver update
  [SCSI] mptsas: remove unneeded check
  [SCSI] config: Make need for SCSI_CDROM clearer
  ...
---

4fdb1d5096dc48f326bf130e453bdd6497e7cab4
diff --combined WHENCE
index d6c227d,441929f..c006af8
--- a/WHENCE
+++ b/WHENCE
@@@ -45,6 -45,32 +45,32 @@@ Found alsa-firmware package in hex form
  
  --------------------------------------------------------------------------
  
+ Driver: SCSI_ADVANSYS - AdvanSys SCSI
+ 
+ File: advansys/mcode.bin
+ File: advansys/3550.bin
+ File: advansys/38C0800.bin
+ File: advansys/38C1600.bin
+ 
+ Licence: BSD, no source available.
+ 
+ Found in hex form in kernel source.
+ 
+ --------------------------------------------------------------------------
+ 
+ Driver: SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI support
+ 
+ File: qlogic/1040.bin
+ File: qlogic/1280.bin
+ File: qlogic/12160.bin
+ 
+ Licence: Allegedly GPLv2+, but no source visible. Marked:
+ 
+                    QLOGIC LINUX SOFTWARE
+   QLogic ISP1280/ device driver for Linux 2.2.x and 2.4.x
+   Copyright (C) 2001 Qlogic Corporation (www.qlogic.com)
+ 
+ --------------------------------------------------------------------------
  Driver: smctr -- SMC ISA/MCA Token Ring adapter
  
  File: tr_smctr.bin
@@@ -364,59 -390,6 +390,59 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
 +Driver: SLICOSS - Alacritech IS-NIC products
 +
 +File: slicoss/gbdownload.sys.ihex
 +File: slicoss/gbrcvucode.sys.ihex
 +File: slicoss/oasisdbgdownload.sys.ihex
 +File: slicoss/oasisdownload.sys.ihex
 +File: slicoss/oasisrcvucode.sys.ihex
 +
 +Licence:
 +		Copyright (C) 1999-2009 Alacritech, Inc.
 +
 +	as an unpublished work. This notice does not imply unrestricted or
 +	public access to the source code from which this firmware image is
 +	derived.  Except as noted below this firmware image may not be
 +	reproduced, used, sold or transferred to any third party without
 +	Alacritech's prior written consent.  All Rights Reserved.
 +
 +	Permission is hereby granted for the distribution of this firmware
 +	image as part of a Linux or other Open Source operating system kernel
 +	in text or binary form as required.
 +
 +	This firmware may not be modified and may only be used with
 +	Alacritech hardware.
 +
 +Found in hex form in kernel source.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: SXG - Alacritech IS-NIC products
 +
 +File: sxg/saharadownloadB.sys.ihex
 +File: sxg/saharadbgdownloadB.sys.ihex
 +
 +Licence:
 +		Copyright (C) 1999-2009 Alacritech, Inc.
 +
 +	as an unpublished work. This notice does not imply unrestricted or
 +	public access to the source code from which this firmware image is
 +	derived.  Except as noted below this firmware image may not be
 +	reproduced, used, sold or transferred to any third party without
 +	Alacritech's prior written consent.  All Rights Reserved.
 +
 +	Permission is hereby granted for the distribution of this firmware
 +	image as part of a Linux or other Open Source operating system kernel
 +	in text or binary form as required.
 +
 +	This firmware may not be modified and may only be used with
 +	Alacritech hardware.
 +
 +Found in hex form in kernel source.
 +
 +--------------------------------------------------------------------------
 +
  Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter
  
  File: cxgb3/t3b_psram-1.1.0.bin.ihex
@@@ -596,3 -569,13 +622,13 @@@ Licence: Allegedly GPL, but no source v
  Found in hex form in kernel source.
  
  --------------------------------------------------------------------------
+ 
+ Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver
+ 
+ File: qlogic/isp1000.bin
+ 
+ Licence: Unknown
+ 
+ Found in hex form in kernel source.
+ 
+ --------------------------------------------------------------------------