Merge commit 'v2.13.1-189-g105e50f6' into thread-next

diff --cc doc/bird.sgml
Simple merge

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

diff --cc sysdep/unix/krt.Y
index 92fc192037aae445e4eb7e6bd5f474a272f703ff,90297d3ff663b5e5c0fa05c20e12e83a1eef1251..7b58c657422df57d43a9af0ce108fb9ff3e1a502
--- 1/sysdep/unix/krt.Y
--- 2/sysdep/unix/krt.Y
+++ b/sysdep/unix/krt.Y
@@@ -29,9 -29,10 +29,10 @@@ kif_set_preferred(ip_addr ip
  
  CF_DECLS
  
 -CF_KEYWORDS(KERNEL, PERSIST, SCAN, TIME, LEARN, DEVICE, ROUTES, GRACEFUL, RESTART, KRT_SOURCE, KRT_METRIC, MERGE, PATHS)
 +CF_KEYWORDS(KERNEL, PERSIST, SCAN, TIME, LEARN, DEVICE, ROUTES, GRACEFUL, RESTART, MERGE, PATHS)
  CF_KEYWORDS(INTERFACE, PREFERRED)
  
+ %type <i> kern_learn
  %type <i> kern_mp_limit
  %type <cc> kern_channel
  

diff --cc sysdep/unix/krt.c
index 54be8b059eb2866ef93535aea11b2b243dcf1724,3a4b24dceb050fce31d06eb3ec922d0e026b1048..6231824128a4ed3adcdf02679e38c4c23b261f57
--- 1/sysdep/unix/krt.c
--- 2/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@@ -446,15 -639,14 +446,19 @@@ krt_got_route(struct krt_proto *p, rte 
  #ifdef KRT_ALLOW_LEARN
    switch (src)
      {
-     case KRT_SRC_KERNEL:
-       krt_trace_in(p, e, "ignored");
-       return;
- 
      case KRT_SRC_REDIRECT:
 -      goto delete;
 +      krt_trace_in(p, e, "deleting");
 +      krt_replace_rte(p, e->net, NULL, e);
 +      return;
  
 -        goto ignore;
+     case KRT_SRC_KERNEL:
+       if (KRT_CF->learn != KRT_LEARN_ALL)
++      {
++      krt_trace_in(p, e, "ignored");
++      return;
++      }
+       /* fallthrough */
+ 
      case  KRT_SRC_ALIEN:
        if (KRT_CF->learn)
        krt_learn_scan(p, e);

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