David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-02 10:55:32 -07:00
..
cxgb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
cxgb3	net: cxgb3_main: fix potential Spectre v1	2018-07-18 13:31:15 -07:00
cxgb4	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
cxgb4vf	net: chelsio: Use zeroing memory allocator instead of allocator/memset	2018-06-04 16:07:30 -04:00
libcxgb	libcxgb: replace vmalloc and memset with vzalloc	2018-07-21 16:32:59 -07: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