diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-30 12:04:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-30 12:04:56 -0700 |
commit | 24e19d279f9e289e965b4bc4710fbccab824c4c4 (patch) | |
tree | e069aec1702532120fdc8a817aab25c87c461410 /drivers/firewire/ohci.c | |
parent | 6538b8ea886e472f4431db8ca1d60478f838d14b (diff) | |
parent | 63d832c30142cdceb478b1cac7d943d83b95b2dc (diff) | |
download | blackbird-op-linux-24e19d279f9e289e965b4bc4710fbccab824c4c4.tar.gz blackbird-op-linux-24e19d279f9e289e965b4bc4710fbccab824c4c4.zip |
Merge tag 'dm-3.15-fixes-3' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/firewire/ohci.c')
0 files changed, 0 insertions, 0 deletions