aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-11-24 09:42:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-11-24 09:42:32 -0800
commitd146194f31c96f9b260c5a1cf1592d2e7f82a2e2 (patch)
treeff576fb60ffbe6d3bcc325b217aef65e05c1331a /net/ipv4/tcp_input.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentarm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block (diff)
downloadlinux-dev-d146194f31c96f9b260c5a1cf1592d2e7f82a2e2.tar.xz
linux-dev-d146194f31c96f9b260c5a1cf1592d2e7f82a2e2.zip
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:: - Fix wrong conflict resolution around CONFIG_ARM64_SSBD - Fix sparse warning on unsigned long constant * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block arm64: sysreg: fix sparse warnings
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions