Merge commit 'f83ce94d5e410d5e5b921121867321c19451896b' into integrated

diff --cc nest/neighbor.c
Simple merge

diff --cc sysdep/linux/netlink.c
index 5b46985892506e0b629a46730bc529514ec19655,08dc11b6e1f3f3a78c3e50c41dcba662f4e059eb..0f458b2c866efda14ae2f8cb9576a05d8a463d94
--- 1/sysdep/linux/netlink.c
--- 2/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@@ -1113,6 -1096,7 +1112,7 @@@ krt_sys_start(struct krt_proto *p
  void
  krt_sys_shutdown(struct krt_proto *p UNUSED)
  {
 -  nl_table_map[KRT_CF->sys.table_id] = NULL;
++  nl_tablex_map(p->addr_type == RT_IPV4)[KRT_CF->sys.table_id] = NULL;
  }
  
  int