From: Linus Torvalds Date: Fri, 30 May 2014 19:04:56 +0000 (-0700) Subject: Merge tag 'dm-3.15-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device... X-Git-Tag: v4.9.8~6336 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24e19d279f9e289e965b4bc4710fbccab824c4c4;p=platform%2Fkernel%2Flinux-rpi3.git Merge tag 'dm-3.15-fixes-3' of git://git./linux/kernel/git/device-mapper/linux-dm Pull device-mapper fixes from Mike Snitzer: "A dm-cache stable fix to split discards on cache block boundaries because dm-cache cannot yet handle discards that span cache blocks. Really fix a dm-mpath LOCKDEP warning that was introduced in -rc1. Add a 'no_space_timeout' control to dm-thinp to restore the ability to queue IO indefinitely when no data space is available. This fixes a change in behavior that was introduced in -rc6 where the timeout couldn't be disabled" * tag 'dm-3.15-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: dm mpath: really fix lockdep warning dm cache: always split discards on cache block boundaries dm thin: add 'no_space_timeout' dm-thin-pool module param --- 24e19d279f9e289e965b4bc4710fbccab824c4c4