David S. Miller 6f6e434aa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... S390 bpf_jit.S is removed in net-next and had changes in 'net', since that code isn't used any more take the removal. TLS data structures split the TX and RX components in 'net-next', put the new struct members from the bug fix in 'net' into the RX part. The 'net-next' tree had some reworking of how the ERSPAN code works in the GRE tunneling code, overlapping with a one-line headroom calculation fix in 'net'. Overlapping changes in __sock_map_ctx_update_elem(), keep the bits that read the prog members via READ_ONCE() into local variables before using them. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-21 16:01:54 -04:00
..
Makefile
upt1_defs.h
vmxnet3_defs.h
vmxnet3_drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00
vmxnet3_ethtool.c	vmxnet3: Replace msleep(1) with usleep_range()	2018-05-17 15:55:38 -04:00
vmxnet3_int.h	vmxnet3: use DMA memory barriers where required	2018-05-14 22:43:57 -04:00