| commit | ee7075d45f57f90a42e61e016562ce8065668201 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 22 Aug 2013 17:43:00 +0000 (22 10:43 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 22 Aug 2013 17:43:00 +0000 (22 10:43 -0700) | ||
| tree | d0204e0b40921edbcf6c0fbcfe2c7439aa7d7323 | treesnapshot (tar.gz zip) |
| parent | 41aacc1eea645c99edbe8fbcf78a97dc9b862adc | commitdiff |
| parent | b936bf8b785f0fbe083d203049e4da1c56ec788f | commitdiff |
Merge tag 'dm-3.11-fixes' of git://git./linux/kernel/git/device-mapper/linux-dm
Pull device mapper fix from Mike Snitzer:
"A patch to fix dm-cache-policy-mq's remove_mapping() conflict with
sparc32"
* tag 'dm-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
dm cache: avoid conflicting remove_mapping() in mq policy
Pull device mapper fix from Mike Snitzer:
"A patch to fix dm-cache-policy-mq's remove_mapping() conflict with
sparc32"
* tag 'dm-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
dm cache: avoid conflicting remove_mapping() in mq policy