[SCSI] Merge branch 'linus'

Conflicts:
	drivers/message/fusion/mptsas.c

fixed up conflict between req->data_len accessors and mptsas driver updates.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

diff --cc drivers/message/fusion/mptsas.c
index 14c490a767a4b718982ea69ccede6efe44b6582c,79f5433359f9b3fc1b346cb78b5d11dcd60d15de..20e0b447e8e83a0ce07455de4d7f56215f43a568
--- 1/drivers/message/fusion/mptsas.c
--- 2/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@@ -2177,32 -1319,26 +2177,32 @@@ static int mptsas_smp_handler(struct Sc
        /* request */
        flagsLength = (MPI_SGE_FLAGS_SIMPLE_ELEMENT |
                       MPI_SGE_FLAGS_END_OF_BUFFER |
 -                     MPI_SGE_FLAGS_DIRECTION |
 -                     mpt_addr_size()) << MPI_SGE_FLAGS_SHIFT;
 +                     MPI_SGE_FLAGS_DIRECTION)
 +                     << MPI_SGE_FLAGS_SHIFT;
-       flagsLength |= (req->data_len - 4);
+       flagsLength |= (blk_rq_bytes(req) - 4);
  
        dma_addr_out = pci_map_single(ioc->pcidev, bio_data(req->bio),
-                                     req->data_len, PCI_DMA_BIDIRECTIONAL);
+                                     blk_rq_bytes(req), PCI_DMA_BIDIRECTIONAL);
        if (!dma_addr_out)
                goto put_mf;
 -      mpt_add_sge(psge, flagsLength, dma_addr_out);
 -      psge += (sizeof(u32) + sizeof(dma_addr_t));
 +      ioc->add_sge(psge, flagsLength, dma_addr_out);
 +      psge += ioc->SGE_size;
  
        /* response */
 -      flagsLength = MPT_SGE_FLAGS_SSIMPLE_READ;
 +      flagsLength = MPI_SGE_FLAGS_SIMPLE_ELEMENT |
 +              MPI_SGE_FLAGS_SYSTEM_ADDRESS |
 +              MPI_SGE_FLAGS_IOC_TO_HOST |
 +              MPI_SGE_FLAGS_END_OF_BUFFER;
 +
 +      flagsLength = flagsLength << MPI_SGE_FLAGS_SHIFT;
-       flagsLength |= rsp->data_len + 4;
+       flagsLength |= blk_rq_bytes(rsp) + 4;
        dma_addr_in =  pci_map_single(ioc->pcidev, bio_data(rsp->bio),
-                                     rsp->data_len, PCI_DMA_BIDIRECTIONAL);
+                                     blk_rq_bytes(rsp), PCI_DMA_BIDIRECTIONAL);
        if (!dma_addr_in)
                goto unmap;
 -      mpt_add_sge(psge, flagsLength, dma_addr_in);
 +      ioc->add_sge(psge, flagsLength, dma_addr_in);
  
 +      INITIALIZE_MGMT_STATUS(ioc->sas_mgmt.status)
        mpt_put_msg_frame(mptsasMgmtCtx, ioc, mf);
  
        timeleft = wait_for_completion_timeout(&ioc->sas_mgmt.done, 10 * HZ);
@@@ -2221,11 -1357,10 +2221,11 @@@
                smprep = (SmpPassthroughReply_t *)ioc->sas_mgmt.reply;
                memcpy(req->sense, smprep, sizeof(*smprep));
                req->sense_len = sizeof(*smprep);
-               req->data_len = 0;
-               rsp->data_len -= smprep->ResponseDataLength;
+               req->resid_len = 0;
+               rsp->resid_len -= smprep->ResponseDataLength;
        } else {
 -              printk(MYIOC_s_ERR_FMT "%s: smp passthru reply failed to be returned\n",
 +              printk(MYIOC_s_ERR_FMT
 +                  "%s: smp passthru reply failed to be returned\n",
                    ioc->name, __func__);
                ret = -ENXIO;
        }

diff --cc drivers/net/Makefile
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_scsi.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_transport.c
Simple merge

diff --cc drivers/scsi/osd/osd_initiator.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/st.c
Simple merge

diff --cc fs/exofs/osd.c
Simple merge