David S. Miller b2d6cee117 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>
2018-05-11 20:53:22 -04:00
..
2018-02-10 13:16:35 -08:00
2018-05-02 17:38:37 -10:00
2018-04-10 11:27:30 -07:00
2018-05-02 16:10:41 +02:00
2018-04-06 15:01:25 -07:00
2018-03-15 20:34:40 +01:00
2018-01-05 18:43:00 +11:00
2018-04-11 10:28:35 -07:00
2018-04-30 12:09:56 -04:00