]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commitd0fbad0aec1df29717fab736eb24c8a49cf2c70b
treeb43d3899460f6d12851051bf2dfbb5594abb6632
parent8d2b6f6b4a805ca74174e779bddde9ad075d3d43
parentbda3153998f3eb2cafa4a6311971143628eacdbc
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