linux/drivers/net/ethernet/8390
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
..
8390.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
8390.h 8390 : Replace ei_debug with msg_enable/NETIF_MSG_* feature 2013-12-11 17:21:02 -05:00
8390p.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
Kconfig net-next: New ax88796 platform driver for Amiga X-Surf 100 Zorro board (m68k) 2018-04-19 16:11:11 -04:00
Makefile net-next: New ax88796 platform driver for Amiga X-Surf 100 Zorro board (m68k) 2018-04-19 16:11:11 -04:00
apne.c ethernet: Use octal not symbolic permissions 2018-03-26 12:07:49 -04:00
ax88796.c net-next: ax88796: release platform device drvdata on probe error and module remove 2018-04-19 16:11:11 -04:00
axnet_cs.c net/8390: Fix msg_enable patch snafu 2018-02-21 14:14:04 -05:00
etherh.c net/8390: Fix msg_enable patch snafu 2018-02-21 14:14:04 -05:00
hydra.c net/8390: Fix msg_enable patch snafu 2018-02-21 14:14:04 -05:00
lib8390.c ethernet: Use octal not symbolic permissions 2018-03-26 12:07:49 -04:00
mac8390.c net/mac8390: Fix log messages 2018-02-21 14:14:05 -05:00
mcf8390.c net/8390: Fix msg_enable patch snafu 2018-02-21 14:14:04 -05:00
ne.c net: 8390: ne: Fix accidentally removed RBTX4927 support 2018-05-16 14:38:54 -04:00
ne2k-pci.c ethernet: Use octal not symbolic permissions 2018-03-26 12:07:49 -04:00
pcnet_cs.c net/8390: Fix msg_enable patch snafu 2018-02-21 14:14:04 -05:00
smc-ultra.c ethernet: Use octal not symbolic permissions 2018-03-26 12:07:49 -04:00
stnic.c ethernet: Use octal not symbolic permissions 2018-03-26 12:07:49 -04:00
wd.c ethernet: Use octal not symbolic permissions 2018-03-26 12:07:49 -04:00
xsurf100.c net-next: New ax88796 platform driver for Amiga X-Surf 100 Zorro board (m68k) 2018-04-19 16:11:11 -04:00
zorro8390.c net/8390: Fix msg_enable patch snafu 2018-02-21 14:14:04 -05:00