Merge tag 'md/3.17-final-fix' of git://neil.brown.name/md
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Oct 2014 15:40:37 +0000 (08:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Oct 2014 15:40:37 +0000 (08:40 -0700)
commitee042ec88022249b848306dd6e87ffd2fd88a839
treec730a6a460b8228094636e21088a9a6277a586a0
parent80ad99da8bd213e12b925407f1c97a303aa8f87f
parent8e0e99ba64c7ba46133a7c8a3e3f7de01f23bd93
Merge tag 'md/3.17-final-fix' of git://neil.brown.name/md

Pull raid5 discard fix from Neil Brown:
 "One fix for raid5 discard issue"

* tag 'md/3.17-final-fix' of git://neil.brown.name/md:
  md/raid5: disable 'DISCARD' by default due to safety concerns.