summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-09 06:38:21 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-09 06:38:21 +0300
commit5d5df5ee7cdb77bfdac3703fd7a6bae5e3e4ab36 (patch)
tree925d6dc51fc02ac46c42fccbbe36f0875d15ca03 /fs
parent1daac193f21d6e3d0adc528a06a7e11522d4254d (diff)
parentcb31ef485dd4c6a205d1064b42027f82076d00c8 (diff)
downloadlinux-5d5df5ee7cdb77bfdac3703fd7a6bae5e3e4ab36.tar.xz
Merge tag 'dm-4.1-fixes-2' of git://git.kernel.org/pub/scm/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"
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions