X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=MAINTAINERS;h=0b3d8fa2fcb2cced256a2e81e507bcf5595f3173;hb=e7a9b3d2545c00689fe7547e7d807fe4a9b3365d;hp=0f5dfc04d84591a5c5246935e7628db6e8728db4;hpb=5c749734b14c2d3be8689b0c5b72ae8d1ddec099;p=vpp.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 0f5dfc04d84..0b3d8fa2fcb 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,27 +105,77 @@ 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>
 F:	src/vnet/mpls/
 
+VNET Host Stack Session Layer
+M:	Florin Coras <fcoras@cisco.com>
+F:	src/vnet/session
+
+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/
 
+VNET VXLAN-GPE
+M:	Keith Burns <alagalah@gmail.com>
+M:	Hongjun Ni <hongjun.ni@intel.com>
+F:	src/vnet/vxlan-gpe/
+
+VNET GENEVE
+M:	Marco Varlese <mvarlese@suse.de>
+F:	src/vnet/geneve/
+
+Plugin - ACL
+M:	Andrew Yourtchenko <ayourtch@gmail.com>
+F:	src/plugins/acl/
+F:	src/plugins/acl.am
+
+VNET IPIP
+M:	Ole Troan <otroan@employees.org>
+F:	src/vnet/ipip/
+
 Plugin - flowprobe
 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
+
+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
 
 Test Infrastructure
 M:	Klement Sekera <ksekera@cisco.com>