tree d0204e0b40921edbcf6c0fbcfe2c7439aa7d7323
parent 41aacc1eea645c99edbe8fbcf78a97dc9b862adc
parent b936bf8b785f0fbe083d203049e4da1c56ec788f
author Linus Torvalds <torvalds@linux-foundation.org> 1377193380 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1377193380 -0700
mergetag object b936bf8b785f0fbe083d203049e4da1c56ec788f
 type commit
 tag dm-3.11-fixes
 tagger Mike Snitzer <snitzer@redhat.com> 1377027505 -0400
 
 A patch to fix dm-cache-policy-mq's remove_mapping() conflict with sparc32.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.13 (GNU/Linux)
 
 iQEcBAABAgAGBQJSE8bRAAoJEMUj8QotnQNaTEEH/A+Nopgj94CbYaty/6iCeCtE
 kUwQh7mCg+JoGK0YfJFq9BgseYSC0iCH0bqgV0vhd46nLxn6k0SUhVB1+exT+d0b
 5enQOQ0ngyji4ghTrNId+FD0KXqkpg96YPyWg2NgoVlVrH1Nk2TNyZSGn5vVisM6
 xSFJ2gjL5o00pspCamVuAHBDYgQPtq3S/JIVk3ndrc3wvUl4SuhJMT6vc39oo0QA
 MndWBgxTHCcMBgcWo5RF7uCYr+HLXf6mD+ZFt4qw+NF3qAkMzM9lSL7YkCWAghPH
 uPktyvwczGI9C+VT5uPD+EbvFJGQbBscV+/wGIEkniWhyIjXcQTfOaTqVpFRcNQ=
 =qzw6
 -----END PGP SIGNATURE-----

Merge tag 'dm-3.11-fixes' of git://git.kernel.org/pub/scm/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