From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Jul 2012 18:51:22 +0000 (-0700)
Subject: Merge tag 'dm-3.5-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=935173744abe86278074ad8f131c1932276b1ac1;p=linux-beck.git

Merge tag 'dm-3.5-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm

Pull device-mapper discard fixes from Alasdair G Kergon:
  - avoid a crash in dm-raid1 when discards coincide with mirror
    recovery;
  - avoid discarding shared data that's still needed in dm-thin;
  - don't guarantee that discarded blocks will be wiped in dm-raid1.

* tag 'dm-3.5-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm:
  dm raid1: set discard_zeroes_data_unsupported
  dm thin: do not send discards to shared blocks
  dm raid1: fix crash with mirror recovery and discard
---

935173744abe86278074ad8f131c1932276b1ac1