From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 May 2015 03:38:21 +0000 (-0700)
Subject: Merge tag 'dm-4.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5d5df5ee7cdb77bfdac3703fd7a6bae5e3e4ab36;p=linux.git

Merge tag 'dm-4.1-fixes-2' of git://git./linux/kernel/git/device-mapper/linux-dm

Pull device mapper fixes from Mike Snitzer:
 "Two additional fixes for changes introduced via DM during the 4.1
  merge window.

  The first reverts a dm-crypt change that wasn't correct.  The second
  fixes a device format regression that impacted userspace"

* tag 'dm-4.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  init: fix regression by supporting devices with major:minor:offset format
  Revert "dm crypt: fix deadlock when async crypto algorithm returns -EBUSY"
---

5d5df5ee7cdb77bfdac3703fd7a6bae5e3e4ab36