Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 17 Apr 2019 18:26:25 +0000 (11:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Apr 2019 18:26:25 +0000 (11:26 -0700)
commit6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b
tree0a7976054052e793da782c2b7ec34eccfbf66449
parentcea0aa9cbd5ad4efe267e9487ed5d48d16756253
parentfe5cdef29e41c8bda8cd1a11545e7c6bfe25570e
Merge git://git./linux/kernel/git/davem/net

Conflict resolution of af_smc.c from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
40 files changed:
.clang-format
MAINTAINERS
Makefile
drivers/net/bonding/bond_main.c
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlxsw/core.c
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
drivers/net/ethernet/qlogic/qed/qed.h
drivers/net/ethernet/qlogic/qed/qed_dev.c
drivers/net/team/team.c
drivers/net/wireless/mac80211_hwsim.c
include/linux/netdevice.h
include/net/sock.h
include/net/tls.h
net/bridge/br_input.c
net/bridge/br_multicast.c
net/bridge/br_netlink.c
net/core/dev.c
net/core/filter.c
net/core/net-sysfs.c
net/core/rtnetlink.c
net/core/skbuff.c
net/ipv4/fou.c
net/ipv4/route.c
net/ipv4/tcp_input.c
net/ipv6/route.c
net/ipv6/udp.c
net/sctp/socket.c
net/smc/af_smc.c
net/smc/smc_pnet.c
net/strparser/strparser.c
net/tipc/link.c
net/tls/tls_main.c
net/tls/tls_sw.c
net/wireless/nl80211.c
tools/testing/selftests/drivers/net/mlxsw/rtnetlink.sh
tools/testing/selftests/net/fib_tests.sh