From: David S. Miller <davem@davemloft.net>
Date: Sun, 10 Dec 2017 03:09:55 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=51e18a453f5f59a40c721d4aeab082b4e2e9fac6;p=linux.git

Merge git://git./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>
---

51e18a453f5f59a40c721d4aeab082b4e2e9fac6
diff --cc net/sched/sch_generic.c
index ff6a5acf6ab05,cd1b200acae74..981c08fe810b4
--- a/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>