Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing

Conflicts:
	bgpd/bgp_evpn.c

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/sbuf.h b/lib/sbuf.h
index 3e49ada6c2..c38e96912f 100644
--- a/lib/sbuf.h
+++ b/lib/sbuf.h
@@ -53,8 +53,10 @@
  *         return 1;
  * }
  *
- * In this case, sbuf_example uses a string buffer with undefined size, which will
- * be allocated on the heap by sbuf. The caller of sbuf_example is expected to free
+ * In this case, sbuf_example uses a string buffer with undefined size, which
+ * will
+ * be allocated on the heap by sbuf. The caller of sbuf_example is expected to
+ * free
  * the string returned in parser_log.
  */