Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
  dm: detect lost queue
  dm: publish dm_vcalloc
  dm: publish dm_table_unplug_all
  dm: publish dm_get_mapinfo
  dm: export struct dm_dev
  dm crypt: avoid unnecessary wait when splitting bio
  dm crypt: tidy ctx pending
  dm crypt: fix async inc_pending
  dm crypt: move dec_pending on error into write_io_submit
  dm crypt: remove inc_pending from write_io_submit
  dm crypt: tidy write loop pending
  dm crypt: tidy crypt alloc
  dm crypt: tidy inc pending
  dm exception store: use chunk_t for_areas
  dm exception store: introduce area_location function
  dm raid1: kcopyd should stop on error if errors handled
  dm mpath: remove is_active from struct dm_path
  dm mpath: use more error codes

Fixed up trivial conflict in drivers/md/dm-mpath.c manually.

diff --cc drivers/md/dm-ioctl.c
Simple merge

diff --cc drivers/md/dm-mpath.c
index 3d38481,b2ab848..103304c
--- 1/drivers/md/dm-mpath.c
--- 2/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@@ -124,10 -123,8 +125,10 @@@ static struct pgpath *alloc_pgpath(void
  {
        struct pgpath *pgpath = kzalloc(sizeof(*pgpath), GFP_KERNEL);
  
 -      if (pgpath)
 +      if (pgpath) {
-               pgpath->path.is_active = 1;
+               pgpath->is_active = 1;
 +              INIT_WORK(&pgpath->deactivate_path, deactivate_path);
 +      }
  
        return pgpath;
  }