]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 4 May 2018 13:58:56 +0000 (09:58 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 4 May 2018 13:58:56 +0000 (09:58 -0400)
commitc910f96f3c0a7ae1bf1aba9115c5b77daf661cc8
treeca5342d29badb2a3cce2a353b786c8ab4a993c1e
parent58c0de47a53dc78eb60381dc01863b6c50daeb84
parent18701c6e4705d8ebfcf6caca1b734fdaefd1dd5e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Overlapping changes in selftests Makefile.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 files changed:
Documentation/networking/ip-sysctl.txt
MAINTAINERS
drivers/net/ethernet/broadcom/bcmsysport.c
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
include/net/tls.h
net/bridge/br_if.c
net/core/ethtool.c
net/ipv4/tcp.c
net/ipv6/route.c
net/smc/af_smc.c
net/smc/smc_core.c
net/smc/smc_core.h
net/tipc/node.c
net/tls/tls_main.c
tools/testing/selftests/bpf/test_progs.c
tools/testing/selftests/net/Makefile