Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 26 Apr 2019 03:52:29 +0000 (23:52 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Apr 2019 03:52:29 +0000 (23:52 -0400)
commit8b4483658364f05b2e32845c8f445cdfd9452286
tree4734ef83378b1e90475ec4776ac72dfe16a7249b
parentc049d56eb219661c9ae48d596c3e633973f89d1f
parentcd8dead0c39457e58ec1d36db93aedca811d48f1
Merge git://git./linux/kernel/git/davem/net

Two easy cases of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
22 files changed:
Documentation/networking/ip-sysctl.txt
MAINTAINERS
Makefile
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/team/team.c
drivers/net/vrf.c
lib/Kconfig.debug
net/bridge/netfilter/ebtables.c
net/ipv4/route.c
net/ipv4/sysctl_net_ipv4.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_nat_core.c
net/netfilter/nf_tables_api.c
net/rxrpc/local_object.c
net/tls/tls_main.c
net/tls/tls_sw.c
tools/testing/selftests/netfilter/Makefile
tools/testing/selftests/netfilter/nft_nat.sh