Merge branch 'sglist-arch' into for-linus

diff --combined Documentation/DMA-mapping.txt
index 8efe12d74268d47a65b8cb3f595bdc87c0400005,6883921743f0a748674c3e35ec0ac02706f5cef8..3c8ae020b6a7e3aeb183a5690ea3f0938c66c4f0
--- 1/Documentation/DMA-mapping.txt
--- 2/Documentation/DMA-mapping.txt
+++ b/Documentation/DMA-mapping.txt
@@@ -514,7 -514,7 +514,7 @@@ With scatterlists, you map a region gat
        int i, count = pci_map_sg(dev, sglist, nents, direction);
        struct scatterlist *sg;
  
-       for (i = 0, sg = sglist; i < count; i++, sg++) {
+       for_each_sg(sglist, sg, count, i) {
                hw_address[i] = sg_dma_address(sg);
                hw_len[i] = sg_dma_len(sg);
        }
@@@ -782,5 -782,5 +782,5 @@@ following people
        Jay Estabrook <Jay.Estabrook@compaq.com>
        Thomas Sailer <sailer@ife.ee.ethz.ch>
        Andrea Arcangeli <andrea@suse.de>
 -      Jens Axboe <axboe@suse.de>
 +      Jens Axboe <jens.axboe@oracle.com>
        David Mosberger-Tang <davidm@hpl.hp.com>

diff --combined drivers/block/cciss.c
index a895228f3d7009bad9cc60e9ef6d0ac55e2ff776,2023d61d5458e848d8efa451a9a6742fc43eabd0..3fb7e8bc436d1b39eb579efc5ddc7b1222d69e4b
--- 1/drivers/block/cciss.c
--- 2/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@@ -1191,6 -1191,7 +1191,6 @@@ static inline void complete_buffers(str
  {
        while (bio) {
                struct bio *xbh = bio->bi_next;
 -              int nr_sectors = bio_sectors(bio);
  
                bio->bi_next = NULL;
                bio_endio(bio, status ? 0 : -EIO);
@@@ -2569,6 -2570,7 +2569,7 @@@ static void do_cciss_request(struct req
               (int)creq->nr_sectors);
  #endif                                /* CCISS_DEBUG */
  
+       memset(tmp_sg, 0, sizeof(tmp_sg));
        seg = blk_rq_map_sg(q, creq, tmp_sg);
  
        /* get the DMA records for the setup */