OSDN Git Service

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jul 2018 19:40:59 +0000 (12:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jul 2018 19:40:59 +0000 (12:40 -0700)
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


Trivial merge