Merge branch 'int-new' into int-new-merged

diff --cc nest/route.h
Simple merge

diff --cc sysdep/bsd/krt-sock.c
Simple merge

diff --cc sysdep/linux/netlink.c
Simple merge

diff --cc sysdep/unix/io.c
index 37e26c9b86aebd787418a32784befc3b8fe78284,afa51be7d63409187652d0bb18ac836c97e6f07a..4db6abb7be48f192046b206ce69fa59ddf678427
--- 1/sysdep/unix/io.c
--- 2/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@@ -38,11 -37,11 +38,11 @@@
  #include "lib/string.h"
  #include "nest/iface.h"
  
- #include "lib/unix.h"
- #include "lib/sysio.h"
+ #include "sysdep/unix/unix.h"
+ #include CONFIG_INCLUDE_SYSIO_H
  
  /* Maximum number of calls of tx handler for one socket in one
 - * select iteration. Should be small enough to not monopolize CPU by
 + * poll iteration. Should be small enough to not monopolize CPU by
   * one protocol instance.
   */
  #define MAX_STEPS 4

diff --cc sysdep/unix/krt.c
Simple merge

diff --cc sysdep/unix/log.c
Simple merge

diff --cc sysdep/unix/main.c
Simple merge