tree 2c6975b47034de78fc899b4191260bb2704efc0f
parent b753a9faaf9aef1338c28ebd9ace6d749428788b
parent 4bc871984f7cb5b2dec3ae64b570cb02f9ce2227
author David S. Miller <davem@davemloft.net> 1526086402 -0400
committer David S. Miller <davem@davemloft.net> 1526086402 -0400

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

The bpf syscall and selftests conflicts were trivial
overlapping changes.

The r8169 change involved moving the added mdelay from 'net' into a
different function.

A TLS close bug fix overlapped with the splitting of the TLS state
into separate TX and RX parts.  I just expanded the tests in the bug
fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf
== X".

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