Merge branch 'master' into evpn-symmetric-routing

diff --cc bgpd/bgp_attr.c
Simple merge

diff --cc bgpd/bgp_evpn.c
index 926549cb4f0e3f72dcee5ba84a7d43dce969b0f2,ca2e1a54d408e8ba3688669fad6a28467365135e..12cc425bd36e5d6d850db63c69ed2756a25a31c5
--- 1/bgpd/bgp_evpn.c
--- 2/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@@ -1206,12 -834,11 +1206,14 @@@ static int update_evpn_route(struct bg
        attr.mp_nexthop_global_in = vpn->originator_ip;
        attr.mp_nexthop_len = BGP_ATTR_NHLEN_IPV4;
        attr.sticky = CHECK_FLAG(flags, ZEBRA_MAC_TYPE_STICKY) ? 1 : 0;
 -      attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_PMSI_TUNNEL);
++  attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_PMSI_TUNNEL);
 +      bgpevpn_get_rmac(vpn, &attr.rmac);
+       vni2label(vpn->vni, &(attr.label));
  
        /* Set up RT and ENCAP extended community. */
 -      build_evpn_route_extcomm(vpn, &attr);
 +      build_evpn_route_extcomm(vpn, &attr,
 +                               IS_EVPN_PREFIX_IPADDR_V4(p) ?
 +                                      AFI_IP : AFI_IP6);
  
        /* First, create (or fetch) route node within the VNI. */
        /* NOTE: There is no RD here. */

diff --cc bgpd/bgp_evpn_vty.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc bgpd/bgpd.h
Simple merge

diff --cc zebra/connected.c
Simple merge

diff --cc zebra/kernel_socket.c
Simple merge

diff --cc zebra/rib.h
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge

diff --cc zebra/zebra_rib.c
Simple merge

diff --cc zebra/zebra_vty.c
Simple merge