From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Jul 2018 19:40:59 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
X-Git-Tag: v4.18-rc4~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d0fbad0aec1df29717fab736eb24c8a49cf2c70b;p=users%2Fhch%2Fdma-mapping.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md

Pull MD fixes from Shaohua Li:
 "Two small fixes for MD:

   - an error handling fix from me

   - a recover bug fix for raid10 from BingJing"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
  md/raid10: fix that replacement cannot complete recovery after reassemble
  MD: cleanup resources in failure
---

d0fbad0aec1df29717fab736eb24c8a49cf2c70b