Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflict was two parallel additions of include files to sch_generic.c,
no biggie.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/bcm_sf2.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/nicvf_queues.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc include/linux/hyperv.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv6/ip6_tunnel.c
Simple merge

diff --cc net/sched/sch_generic.c
index ff6a5ac,cd1b200..981c08f
--- 1/net/sched/sch_generic.c
--- 2/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@@ -26,7 -26,7 +26,8 @@@
  #include <linux/list.h>
  #include <linux/slab.h>
  #include <linux/if_vlan.h>
 +#include <linux/skb_array.h>
+ #include <linux/if_macvlan.h>
  #include <net/sch_generic.h>
  #include <net/pkt_sched.h>
  #include <net/dst.h>

diff --cc tools/testing/selftests/bpf/Makefile
Simple merge