X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=MAINTAINERS;h=4306ecbec32e81a10df059e3dc537cddfd63723f;hb=06fda9cea94e0009fd0238a77d2e0f39e46f666c;hp=2c6c2583ae99169d1deb1d9ed050422ff5fc02f8;hpb=5e5028ed577ac1641f2a8d00136abe13b2fb15c5;p=vpp.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 2c6c2583ae9..4306ecbec32 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -28,6 +28,11 @@ Doxygen
 M:	Chris Luke <chrisy@flirble.org>
 F:	doxygen/
 
+Sphinx Documents
+M:     John DeNisco <jdenisco@cisco.com>
+M:     Ray Kinsella <raykinsella78@gmail.com>
+F:     docs/
+
 DPDK Development Packaging
 M:	Damjan Marion <damarion@cisco.com>
 F:	dpdk/
@@ -46,7 +51,6 @@ VLIB API Libraries
 M:	Dave Barach <dave@barachs.net>
 F:	src/vlibapi/
 F:	src/vlibmemory/
-F:	src/vlibsocket/
 
 VNET Bidirectonal Forwarding Detection (BFD)
 M:	Klement Sekera <ksekera@cisco.com>
@@ -57,7 +61,8 @@ M:	Damjan Marion <damarion@cisco.com>
 F:	src/vnet/devices/
 
 VNET Device Drivers - DPDK Crypto
-M:	Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
+M:	Sergio Gonzalez Monroy <sergio.gonzalez.monroy@outlook.com>
+M:      Radu Nicolau <radu.nicolau@intel.com>
 F:	src/devices/dpdk/ipsec/
 
 VNET Feature Arcs
@@ -83,8 +88,8 @@ F:	src/vnet/srmpls/
 F:	src/examples/srv6-sample-localsid/
 
 VNET IPSec
-M:	Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
 M:	Matus Fabian <matfabia@cisco.com>
+M:	Radu Nicolau <radu.nicolau@intel.com>
 F:	src/vnet/ipsec/
 
 VNET L2
@@ -100,9 +105,9 @@ M:	Florin Coras <fcoras@cisco.com>
 F:	src/vnet/lisp-cp/
 F:	src/vnet/lisp-gpe/
 
-VNET MAP
+Plugin - MAP
 M:	Ole Troan <ot@cisco.com>
-F:	src/vnet/map
+F:	src/plugins/map
 
 VNET MPLS
 M:	Neale Ranns <nranns@cisco.com>
@@ -116,6 +121,10 @@ VNET TCP Stack
 M:	Florin Coras <fcoras@cisco.com>
 F:	src/vnet/tcp
 
+VNET SCTP Stack
+M:	Marco Varlese <mvarlese@suse.de>
+F:	src/vnet/sctp
+
 VNET VXLAN
 M:	John Lo <loj@cisco.com>
 F:	src/vnet/vxlan/
@@ -126,9 +135,20 @@ M:	Hongjun Ni <hongjun.ni@intel.com>
 F:	src/vnet/vxlan-gpe/
 
 VNET GENEVE
-M:	Marco Varlese <marco.varlese@suse.com>
+M:	Marco Varlese <mvarlese@suse.de>
 F:	src/vnet/geneve/
 
+VNET IPIP
+M:	Ole Troan <otroan@employees.org>
+F:	src/vnet/ipip/
+
+VNET TLS and TLS engine plugins
+M: 	Florin Coras <fcoras@cisco.com>
+M:	Ping Yu <ping.yu@intel.com>
+F:	src/vnet/tls
+F:	src/plugins/tlsopenssl
+F:	src/plugins/tlsmbedtls
+
 Plugin - ACL
 M:	Andrew Yourtchenko <ayourtch@gmail.com>
 F:	src/plugins/acl/
@@ -139,20 +159,43 @@ M:	Ole Troan <otroan@employees.org>
 F:	src/plugins/flowprobe/
 F:	src/plugins/flowprobe.am
 
-Plugin - SIXRD
-M:	Ole Troan <ot@cisco.com>
-F:	src/plugins/sixrd/
-F:	src/plugins/sixrd.am
-
 Plugin - GTPU
 M:	Hongjun Ni <hongjun.ni@intel.com>
 F:	src/plugins/gtpu/
 F:	src/plugins/gtpu.am
 
 Plugin - PPPoE
-M:  Hongjun Ni <hongjun.ni@intel.com>
-F:  src/plugins/pppoe/
-F:  src/plugins/pppoe.am
+M:	Hongjun Ni <hongjun.ni@intel.com>
+F:	src/plugins/pppoe/
+F:	src/plugins/pppoe.am
+
+Plugin - IPv6 Segment Routing Dynamic Proxy
+M:	Francois Clad <fclad@cisco.com>
+F:	src/plugins/srv6-ad/
+F:	src/plugins/srv6_ad.am
+
+Plugin - IPv6 Segment Routing Masquerading Proxy
+M:	Francois Clad <fclad@cisco.com>
+F:	src/plugins/srv6-am/
+F:	src/plugins/srv6_am.am
+
+Plugin - IPv6 Segment Routing Static Proxy
+M:	Francois Clad <fclad@cisco.com>
+F:	src/plugins/srv6-as/
+F:	src/plugins/srv6_as.am
+
+Plugin - Load Balancer
+M:      Pierre Pfister <ppfister@cisco.com>
+M:      Hongjun Ni <hongjun.ni@intel.com>
+F:      src/plugins/lb/
+F:      src/plugins/lb.am
+
+Plugin - NSH
+M:      Hongjun Ni <hongjun.ni@intel.com>
+M:      Keith Burns <alagalah@gmail.com>
+M:      Vengada <venggovi@cisco.com>
+F:      src/plugins/nsh/
+F:      src/plugins/nsh.am
 
 Test Infrastructure
 M:	Klement Sekera <ksekera@cisco.com>