diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-28 11:09:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-28 11:09:04 -0800 |
| commit | dd553962675ab5747e887f89aea1ece90e6a802e (patch) | |
| tree | d999368d0921e139b7b67ea0fc6a4e6ac548d8dc /net/xfrm/Kconfig | |
| parent | 64a172d265643b345007ddaafcc523f6e5373b69 (diff) | |
| parent | 2e38a37f23c98d7fad87ff022670060b8a0e2bf5 (diff) | |
Merge tag 'md/4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
Pull MD fixes from Shaohua Li:
"This fixes several corner cases for raid5 cache, which is merged into
this cycle"
* tag 'md/4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
md/r5cache: disable write back for degraded array
md/r5cache: shift complex rmw from read path to write path
md/r5cache: flush data only stripes in r5l_recovery_log()
md/raid5: move comment of fetch_block to right location
md/r5cache: read data into orig_page for prexor of cached data
md/raid5-cache: delete meaningless code
Diffstat (limited to 'net/xfrm/Kconfig')