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
..
core	RDMA/cma: Do not query GID during QP state transition to RTR	2018-05-03 15:45:18 -04:00
hw	First pull request for 4.17-rc	2018-05-04 20:51:10 -10:00
sw	IB/rxe: avoid double kfree_skb	2018-04-27 14:20:47 -04:00
ulp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-11 20:53:22 -04:00
Kconfig	IB: make INFINIBAND_ADDR_TRANS configurable	2018-04-27 11:15:44 -04:00
Makefile	IB/rdmavt: Create module framework and handle driver registration	2016-03-10 20:37:04 -05:00