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-03-28 14:30:41 +10:00
2017-03-28 16:16:52 +02:00
2018-05-03 01:17:44 +09:00
2017-11-17 17:45:29 -08:00
2018-04-03 15:51:22 -07:00
2018-03-26 02:01:18 +09:00
2018-02-02 00:21:47 +09:00
2018-04-04 16:01:43 -07:00
2017-11-17 17:45:29 -08:00
2017-11-14 18:25:40 -08:00
2017-11-17 17:45:29 -08:00
2018-02-06 18:32:47 -08:00
2017-11-17 17:45:29 -08:00
2017-11-17 17:45:29 -08:00
2018-04-04 16:43:47 -07:00
2014-08-20 16:03:45 +02:00