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
..
cxgb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
cxgb3	ethernet: Use octal not symbolic permissions	2018-03-26 12:07:49 -04:00
cxgb4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-11 20:53:22 -04:00
cxgb4vf	cxgb4vf: display pause settings	2018-04-17 13:54:00 -04:00
libcxgb	libcxgb,cxgb4: use __skb_put_zero to simplfy code	2018-04-30 11:53:48 -04:00
Kconfig	cxgb4: enable ZLIB_DEFLATE when building cxgb4	2018-01-24 10:56:59 -05:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00