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
..
3c59x.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00
3c509.c	net: 3c509: constify eisa_device_id	2017-08-19 17:13:40 -07:00
3c515.c	drivers/net: 3com/3c515: Convert timers to use timer_setup()	2017-10-27 12:09:15 +09:00
3c574_cs.c	net: 3com: 3c574_cs: mark expected switch fall-through	2017-11-11 19:10:06 +09:00
3c589_cs.c	drivers/net/3com: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
Kconfig
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
typhoon.c	net: typhoon: Use net_device_stats from struct net_device	2017-04-07 07:03:33 -07:00
typhoon.h