diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-02 12:40:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-02 12:40:59 -0700 |
| commit | d0fbad0aec1df29717fab736eb24c8a49cf2c70b (patch) | |
| tree | b43d3899460f6d12851051bf2dfbb5594abb6632 /net/l2tp/l2tp_ppp.c | |
| parent | 8d2b6f6b4a805ca74174e779bddde9ad075d3d43 (diff) | |
| parent | bda3153998f3eb2cafa4a6311971143628eacdbc (diff) | |
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
Diffstat (limited to 'net/l2tp/l2tp_ppp.c')
0 files changed, 0 insertions, 0 deletions