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
..
8139cp.c	8139cp: Replace WARN_ONCE with netdev_WARN_ONCE	2018-01-08 20:53:15 -05:00
8139too.c	8139too: Use disable_irq_nosync() in rtl8139_poll_controller()	2018-05-02 13:22:06 -04:00
atp.c	drivers/net: realtek: Convert timers to use timer_setup()	2017-10-27 12:09:16 +09:00
atp.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Kconfig	drivers/net: remove all references to obsolete Ethernet-HOWTO	2015-06-23 06:50:35 -07:00
Makefile
r8169.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-11 20:53:22 -04:00