kernel_optimize_test/net/dsa
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
..
dsa_priv.h net: dsa: Plug in PHYLINK support 2018-05-11 12:03:06 -04:00
dsa.c net: dsa: forward timestamping callbacks to switch drivers 2018-02-14 14:33:37 -05:00
dsa2.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-05-21 16:01:54 -04:00
Kconfig net: dsa: Add PHYLINK switch operations 2018-05-11 12:03:05 -04:00
legacy.c net: dsa: Fix dsa_is_user_port() test inversion 2018-03-12 21:04:55 -04:00
Makefile net: dsa: Allow compiling out legacy support 2017-12-07 14:14:54 -05:00
master.c net: dsa: Allow providing PHY statistics from CPU port 2018-04-27 11:53:03 -04:00
port.c net: dsa: Allow providing PHY statistics from CPU port 2018-04-27 11:53:03 -04:00
slave.c net: dsa: Plug in PHYLINK support 2018-05-11 12:03:06 -04:00
switch.c net: dsa: support cross-chip FDB operations 2017-12-02 21:21:17 -05:00
tag_brcm.c net: dsa: Move padding into Broadcom tagger 2018-01-05 11:21:31 -05:00
tag_dsa.c net: dsa: {e}dsa: set offload_fwd_mark on received packets 2017-11-11 19:33:11 +09:00
tag_edsa.c net: dsa: {e}dsa: set offload_fwd_mark on received packets 2017-11-11 19:33:11 +09:00
tag_ksz.c
tag_lan9303.c net: dsa: lan9303: calculate offload_fwd_mark from tag 2017-11-14 21:47:48 +09:00
tag_mtk.c net: dsa: mediatek: combine MediaTek tag with VLAN tag 2017-12-15 10:31:54 -05:00
tag_qca.c
tag_trailer.c