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
..
mlx4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-11 20:53:22 -04:00
mlx5/core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-11 20:53:22 -04:00
mlxfw	net/mlxfw: Properly handle dependancy with non-loadable mlx5	2017-07-03 02:32:25 -07:00
mlxsw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-11 20:53:22 -04:00
Kconfig	Change Kconfig description	2017-08-14 11:18:16 -07:00
Makefile	Add the mlxfw module for Mellanox firmware flash process	2017-05-25 17:46:17 -04:00