summaryrefslogtreecommitdiffstats
path: root/net/ipv4/gre_offload.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-07-02 21:40:59 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2018-07-02 21:40:59 +0200
commitd0fbad0aec1df29717fab736eb24c8a49cf2c70b (patch)
treeb43d3899460f6d12851051bf2dfbb5594abb6632 /net/ipv4/gre_offload.c
parentMerge tag 'for-linus' of git://github.com/stffrdhrn/linux (diff)
parentmd/raid10: fix that replacement cannot complete recovery after reassemble (diff)
downloadlinux-d0fbad0aec1df29717fab736eb24c8a49cf2c70b.tar.xz
linux-d0fbad0aec1df29717fab736eb24c8a49cf2c70b.zip
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/ipv4/gre_offload.c')
0 files changed, 0 insertions, 0 deletions