Merge commit '2b7643e1f8ecb0bd4cf9af4183b4fd53b655d19c' into thread-next

diff --cc sysdep/linux/netlink.c
index 288261f5259484e33c6d5217c29d14ad3a4d1073,7f0d4736898a3b2ad33bf2fdf69301206d01df65..0609fde890fe4da20d37db0259f08dd086d7c8ff
--- 1/sysdep/linux/netlink.c
--- 2/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@@ -25,59 -25,9 +25,10 @@@
  #include "lib/socket.h"
  #include "lib/string.h"
  #include "lib/hash.h"
 +#include "lib/macro.h"
  #include "conf/conf.h"
  
- #ifdef CONFIG_LINUX_NETLINK
- #include <asm/types.h>
- #include <linux/if.h>
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
- #endif
- #ifdef CONFIG_FREEBSD_NETLINK
- #include <netlink/netlink.h>
- #include <netlink/netlink_route.h>
- #endif
- 
- #ifdef HAVE_MPLS_KERNEL
- #include <linux/lwtunnel.h>
- #endif
- 
- #ifndef MSG_TRUNC                     /* Hack: Several versions of glibc miss this one :( */
- #define MSG_TRUNC 0x20
- #endif
- 
- #ifndef IFA_FLAGS
- #define IFA_FLAGS 8
- #endif
- 
- #ifndef IFF_LOWER_UP
- #define IFF_LOWER_UP 0x10000
- #endif
- 
- #ifndef RTA_TABLE
- #define RTA_TABLE  15
- #endif
- 
- #ifndef RTA_VIA
- #define RTA_VIA        18
- #endif
- 
- #ifndef RTA_NEWDST
- #define RTA_NEWDST  19
- #endif
- 
- #ifndef RTA_ENCAP_TYPE
- #define RTA_ENCAP_TYPE        21
- #endif
- 
- #ifndef RTA_ENCAP
- #define RTA_ENCAP  22
- #endif
- 
- #ifndef NETLINK_GET_STRICT_CHK
- #define NETLINK_GET_STRICT_CHK 12
- #endif
+ #include CONFIG_INCLUDE_NLSYS_H
  
  #define krt_ipv4(p) ((p)->af == AF_INET)