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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits)
  [SCSI] 53c700: remove reliance on deprecated cmnd fields
  [SCSI] hptiop: don't use cmnd->bufflen
  [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
  [SCSI] aacraid: small misc. cleanups
  [SCSI] aacraid: Update supported product information
  [SCSI] aacraid: Fix return code interpretation
  [SCSI] scsi_transport_sas: fix panic in sas_free_rphy
  [SCSI] remove RQ_SCSI_* flags
  [SCSI] remove scsi_request infrastructure
  [SCSI] mptfusion: change driver revision to 3.03.10
  [SCSI] mptfc: abort of board reset leaves port dead requiring reboot
  [SCSI] mptfc: fix fibre channel infinite request/response loop
  [SCSI] mptfc: set fibre channel fw target missing timers to one second
  [SCSI] mptfusion: move fc event/reset handling to mptfc
  [SCSI] spi transport: don't allow dt to be set on SE or HVD buses
  [SCSI] aic7xxx: expose the bus setting to sysfs
  [SCSI] scsi: remove Documentation/scsi/cpqfc.txt
  [SCSI] drivers/scsi: Use ARRAY_SIZE macro
  [SCSI] Remove last page_address from dc395x.c
  [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
  ...

Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to
the sparc interrupt cleanups)

2 files changed, 10 insertions, 9 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 45bcda544880..dd8a1501142f 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -17,8 +17,8 @@
 */
 
 
-#define DAC960_DriverVersion                    "2.5.47"
-#define DAC960_DriverDate                       "14 November 2002"
+#define DAC960_DriverVersion                    "2.5.48"
+#define DAC960_DriverDate                       "14 May 2006"
 
 
 #include <linux/module.h>
@@ -4780,15 +4780,16 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
               (NewPhysicalDeviceInfo->LogicalUnit !=
                PhysicalDeviceInfo->LogicalUnit))
             {
-              PhysicalDeviceInfo = (DAC960_V2_PhysicalDeviceInfo_T *)
+              PhysicalDeviceInfo =
                 kmalloc(sizeof(DAC960_V2_PhysicalDeviceInfo_T), GFP_ATOMIC);
               InquiryUnitSerialNumber =
-                (DAC960_SCSI_Inquiry_UnitSerialNumber_T *)
                   kmalloc(sizeof(DAC960_SCSI_Inquiry_UnitSerialNumber_T),
                           GFP_ATOMIC);
-              if (InquiryUnitSerialNumber == NULL &&
-                  PhysicalDeviceInfo != NULL)
+              if (InquiryUnitSerialNumber == NULL ||
+                  PhysicalDeviceInfo == NULL)
                 {
+                  kfree(InquiryUnitSerialNumber);
+                  InquiryUnitSerialNumber = NULL;
                   kfree(PhysicalDeviceInfo);
                   PhysicalDeviceInfo = NULL;
                 }
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index 597c007fe81b..afdff32f6724 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -578,7 +578,7 @@ complete_scsi_command( CommandList_struct *cp, int timeout, __u32 tag)
 
         if (cmd->use_sg) {
                 pci_unmap_sg(ctlr->pdev,
-                        cmd->buffer, cmd->use_sg,
+                        cmd->request_buffer, cmd->use_sg,
                                 cmd->sc_data_direction); 
         }
         else if (cmd->request_bufflen) {
@@ -1210,7 +1210,7 @@ cciss_scatter_gather(struct pci_dev *pdev,
                 struct scsi_cmnd *cmd)
 {
         unsigned int use_sg, nsegs=0, len;
-        struct scatterlist *scatter = (struct scatterlist *) cmd->buffer;
+        struct scatterlist *scatter = (struct scatterlist *) cmd->request_buffer;
         __u64 addr64;
 
         /* is it just one virtual address? */   
@@ -1232,7 +1232,7 @@ cciss_scatter_gather(struct pci_dev *pdev,
         } /* else, must be a list of virtual addresses.... */
         else if (cmd->use_sg <= MAXSGENTRIES) { /* not too many addrs? */
 
-                use_sg = pci_map_sg(pdev, cmd->buffer, cmd->use_sg, 
+                use_sg = pci_map_sg(pdev, cmd->request_buffer, cmd->use_sg,
                         cmd->sc_data_direction);
 
                 for (nsegs=0; nsegs < use_sg; nsegs++) {