From: David Ahern <dsahern@kernel.org>
Date: Tue, 14 Jul 2020 23:52:43 +0000 (+0000)
Subject: Merge branch 'main' into next
X-Git-Tag: v5.9.0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b78c480532013b31148ec319c30ba0f659547831;p=thirdparty%2Fiproute2.git

Merge branch 'main' into next

Signed-off-by: David Ahern <dsahern@kernel.org>
---

b78c480532013b31148ec319c30ba0f659547831
diff --cc devlink/devlink.c
index 75182cac7,7f83fb746..67681492f
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@@ -23,10 -27,12 +27,13 @@@
  #define _LINUX_SYSINFO_H /* avoid collision with musl header */
  #include <linux/genetlink.h>
  #include <linux/devlink.h>
+ #include <linux/netlink.h>
  #include <libmnl/libmnl.h>
  #include <netinet/ether.h>
+ #include <sys/select.h>
+ #include <sys/socket.h>
  #include <sys/types.h>
 +#include <rt_names.h>
  
  #include "SNAPSHOT.h"
  #include "list.h"