Merge branch 'for-3.10/drivers' of git://git.kernel.dk/linux-block

Pull block driver updates from Jens Axboe:
 "It might look big in volume, but when categorized, not a lot of
  drivers are touched.  The pull request contains:

   - mtip32xx fixes from Micron.

   - A slew of drbd updates, this time in a nicer series.

   - bcache, a flash/ssd caching framework from Kent.

   - Fixes for cciss"

* 'for-3.10/drivers' of git://git.kernel.dk/linux-block: (66 commits)
  bcache: Use bd_link_disk_holder()
  bcache: Allocator cleanup/fixes
  cciss: bug fix to prevent cciss from loading in kdump crash kernel
  cciss: add cciss_allow_hpsa module parameter
  drivers/block/mg_disk.c: add CONFIG_PM_SLEEP to suspend/resume functions
  mtip32xx: Workaround for unaligned writes
  bcache: Make sure blocksize isn't smaller than device blocksize
  bcache: Fix merge_bvec_fn usage for when it modifies the bvm
  bcache: Correctly check against BIO_MAX_PAGES
  bcache: Hack around stuff that clones up to bi_max_vecs
  bcache: Set ra_pages based on backing device's ra_pages
  bcache: Take data offset from the bdev superblock.
  mtip32xx: mtip32xx: Disable TRIM support
  mtip32xx: fix a smatch warning
  bcache: Disable broken btree fuzz tester
  bcache: Fix a format string overflow
  bcache: Fix a minor memory leak on device teardown
  bcache: Documentation updates
  bcache: Use WARN_ONCE() instead of __WARN()
  bcache: Add missing #include <linux/prefetch.h>
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/block/aoe/aoecmd.c
index 5efed08,67d216c..fc803ec
--- 1/drivers/block/aoe/aoecmd.c
--- 2/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@@ -928,8 -925,8 +926,8 @@@ bufinit(struct buf *buf, struct reques
        buf->resid = bio->bi_size;
        buf->sector = bio->bi_sector;
        bio_pageinc(bio);
-       buf->bv = bv = bio_iovec(bio);
-       buf->bv_resid = bv->bv_len;
 -      buf->bv = &bio->bi_io_vec[bio->bi_idx];
++      buf->bv = bio_iovec(bio);
+       buf->bv_resid = buf->bv->bv_len;
        WARN_ON(buf->bv_resid == 0);
  }
  

diff --cc drivers/block/cciss.c
Simple merge

diff --cc drivers/block/drbd/drbd_main.c
Simple merge

diff --cc drivers/block/drbd/drbd_proc.c
index 928adb8,30fe0a5..bf31d41
--- 1/drivers/block/drbd/drbd_proc.c
--- 2/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
@@@ -313,8 -313,14 +313,14 @@@ static int drbd_seq_show(struct seq_fil
  
  static int drbd_proc_open(struct inode *inode, struct file *file)
  {
-       if (try_module_get(THIS_MODULE))
-               return single_open(file, drbd_seq_show, PDE_DATA(inode));
+       int err;
+ 
+       if (try_module_get(THIS_MODULE)) {
 -              err = single_open(file, drbd_seq_show, PDE(inode)->data);
++              err = single_open(file, drbd_seq_show, PDE_DATA(inode));
+               if (err)
+                       module_put(THIS_MODULE);
+               return err;
+       }
        return -ENODEV;
  }
  

diff --cc drivers/block/drbd/drbd_receiver.c
Simple merge

diff --cc drivers/block/mg_disk.c
Simple merge

diff --cc drivers/block/mtip32xx/mtip32xx.c
Simple merge

diff --cc drivers/block/mtip32xx/mtip32xx.h
index 8e8334c,579fb84..3bb8a29
--- 1/drivers/block/mtip32xx/mtip32xx.h
--- 2/drivers/block/mtip32xx/mtip32xx.h
+++ b/drivers/block/mtip32xx/mtip32xx.h
@@@ -502,9 -511,7 +511,11 @@@ struct driver_data 
  
        int isr_binding;
  
+       int unal_qdepth; /* qdepth of unaligned IO queue */
++
 +      struct list_head online_list; /* linkage for online list */
 +
 +      struct list_head remove_list; /* linkage for removing list */
  };
  
  #endif

diff --cc include/linux/idr.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/lockdep.c
Simple merge

diff --cc kernel/trace/blktrace.c
Simple merge