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-04-11 10:28:38 -07:00
2018-04-10 09:58:58 -04:00
2018-04-06 18:31:06 -07:00
2018-05-03 16:49:20 -07:00
2018-04-11 10:28:39 -07:00
2018-04-11 16:02:18 -07:00
2018-04-15 12:27:58 -07:00
2018-05-02 21:47:35 +02:00
2018-05-11 13:35:46 -04:00
2018-04-11 10:28:38 -07:00