David S. Miller 375ca548f7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two easily resolvable overlapping change conflicts, one in
TCP and one in the eBPF verifier.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-02-20 00:34:07 -08:00

..

asm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2019-02-20 00:34:07 -08:00

uapi/asm

socket: Rename SO_RCVTIMEO/ SO_SNDTIMEO with _OLD suffixes

2019-02-03 11:17:31 -08:00