Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 17 Jan 2018 05:00:25 +0000 (00:00 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Jan 2018 05:10:42 +0000 (00:10 -0500)
commitc02b3741eb99a1ec733e6134c53ba59e43e19e97
treeff7dd96c32dec2abe530e7101378443dabcb8962
parent7018d1b3f20fb4308ed9bc577160cb8ffb79b62a
parent8cbab92dff778e516064c13113ca15d4869ec883
Merge git://git./linux/kernel/git/davem/net

Overlapping changes all over.

The mini-qdisc bits were a little bit tricky, however.

Signed-off-by: David S. Miller <davem@davemloft.net>
38 files changed:
MAINTAINERS
arch/x86/Kconfig
arch/x86/lib/Makefile
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
drivers/net/ethernet/qlogic/qed/qed_spq.c
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/wireless/mac80211_hwsim.c
include/linux/mlx5/mlx5_ifc.h
include/linux/ptr_ring.h
include/net/cfg80211.h
include/net/sch_generic.h
kernel/bpf/verifier.c
kernel/trace/Kconfig
net/core/neighbour.c
net/ipv4/arp.c
net/ipv4/esp4.c
net/ipv4/esp4_offload.c
net/ipv4/route.c
net/ipv6/esp6.c
net/ipv6/esp6_offload.c
net/ipv6/ip6_output.c
net/netlink/af_netlink.c
net/sched/sch_api.c
net/sched/sch_generic.c
net/sched/sch_ingress.c
net/sctp/outqueue.c
net/sctp/socket.c
net/wireless/nl80211.c
net/xfrm/xfrm_input.c
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_state.c
tools/testing/selftests/bpf/test_verifier.c