Merge branch 'master' of https://github.com/frrouting/frr into pmsi-parse-display

Conflicts:
	bgpd/bgp_attr.c

diff --cc bgpd/bgp_attr.c
index 73256046f628963980613426ade13d154063f447,c23950799f3aaeceae0c613186d9251b310e4cef..c3a110599594baa9d1535f4281057085911924ed
--- 1/bgpd/bgp_attr.c
--- 2/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@@ -3311,9 -3263,11 +3311,11 @@@ bgp_size_t bgp_packet_attribute(struct 
                stream_putc(s, BGP_ATTR_PMSI_TUNNEL);
                stream_putc(s, 9); // Length
                stream_putc(s, 0); // Flags
 -              stream_putc(s, 6); // Tunnel type: Ingress Replication (6)
 +              stream_putc(s, PMSI_TNLTYPE_INGR_REPL); // IR (6)
-               stream_put(s, &(attr->label), BGP_LABEL_BYTES); // MPLS Label / VXLAN VNI
-               stream_put_ipv4(s, attr->nexthop.s_addr); // Unicast tunnel endpoint IP address
+               stream_put(s, &(attr->label),
+                          BGP_LABEL_BYTES); // MPLS Label / VXLAN VNI
+               stream_put_ipv4(s, attr->nexthop.s_addr);
+               // Unicast tunnel endpoint IP address
        }
  
        /* Unknown transit attribute. */

diff --cc bgpd/bgp_attr.h
Simple merge

diff --cc bgpd/bgp_evpn.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge