Merge tag 'dm-3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm

Pull device-mapper changes from Alasdair G Kergon:
 "Add a device-mapper target called dm-switch to provide a multipath
  framework for storage arrays that dynamically reconfigure their
  preferred paths for different device regions.

  Fix a bug in the verity target that prevented its use with some
  specific sizes of devices.

  Improve some locking mechanisms in the device-mapper core and bufio.

  Add Mike Snitzer as a device-mapper maintainer.

  A few more clean-ups and fixes"

* tag 'dm-3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm:
  dm: add switch target
  dm: update maintainers
  dm: optimize reorder structure
  dm: optimize use SRCU and RCU
  dm bufio: submit writes outside lock
  dm cache: fix arm link errors with inline
  dm verity: use __ffs and __fls
  dm flakey: correct ctr alloc failure mesg
  dm verity: remove pointless comparison
  dm: use __GFP_HIGHMEM in __vmalloc
  dm verity: fix inability to use a few specific devices sizes
  dm ioctl: set noio flag to avoid __vmalloc deadlock
  dm mpath: fix ioctl deadlock when no paths

1 files changed, 2 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 3a81b6d08833..9d771d9825cf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2574,6 +2574,7 @@ S:	Maintained
 
 DEVICE-MAPPER  (LVM)
 M:      Alasdair Kergon <agk@redhat.com>
+M:      Mike Snitzer <snitzer@redhat.com>
 M:      dm-devel@redhat.com
 L:      dm-devel@redhat.com
 W:      http://sources.redhat.com/dm
@@ -2585,6 +2586,7 @@ F:	drivers/md/dm*
 F:      drivers/md/persistent-data/
 F:      include/linux/device-mapper.h
 F:      include/linux/dm-*.h
+F:      include/uapi/linux/dm-*.h
 
 DIOLAN U2C-12 I2C DRIVER
 M:      Guenter Roeck <linux@roeck-us.net>