summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_tunnel.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-03-05 20:57:06 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2018-03-05 20:57:06 +0100
commit094b58e1040a44f991d7ab628035e69c4d6b79c9 (patch)
treee0cee3d7e8eac592c047bd68785b33aad37d6863 /net/ipv4/ip_tunnel.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentselftests: memory-hotplug: fix emit_tests regression (diff)
downloadlinux-094b58e1040a44f991d7ab628035e69c4d6b79c9.tar.xz
linux-094b58e1040a44f991d7ab628035e69c4d6b79c9.zip
Merge tag 'linux-kselftest-4.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest fixes from Shuah Khan: "A fix for regression in memory-hotplug install script that prevents the test from running on the target" * tag 'linux-kselftest-4.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests: memory-hotplug: fix emit_tests regression
Diffstat (limited to 'net/ipv4/ip_tunnel.c')
0 files changed, 0 insertions, 0 deletions