X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=MAINTAINERS;h=c62128933782183b909fe55608292e8fbdedfde1;hb=67d2a1880b5d46bbcaee6d4b10d4823bdbf10b7b;hp=b1d4ded1b16f83765cbd9aab75eb0743998b1546;hpb=bb9cd91095b3e8e2ce2714baa7cd2ea38414f3d8;p=dpdk.git

diff --git a/MAINTAINERS b/MAINTAINERS
index b1d4ded1b1..c621289337 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -64,6 +64,8 @@ T: git://dpdk.org/next/dpdk-next-eventdev
 Stable Branches
 M: Luca Boccassi <bluca@debian.org>
 M: Kevin Traynor <ktraynor@redhat.com>
+M: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+M: Xueming Li <xuemingl@nvidia.com>
 T: git://dpdk.org/dpdk-stable
 
 Security Issues
@@ -440,7 +442,7 @@ F: doc/guides/prog_guide/rte_security.rst
 F: app/test/test_security.c
 
 Compression API - EXPERIMENTAL
-M: Fiona Trahe <fiona.trahe@intel.com>
+M: Fan Zhang <roy.fan.zhang@intel.com>
 M: Ashish Gupta <ashish.gupta@marvell.com>
 T: git://dpdk.org/next/dpdk-next-crypto
 F: lib/compressdev/
@@ -534,15 +536,6 @@ T: git://dpdk.org/next/dpdk-next-net-mrvl
 F: drivers/mempool/cnxk/
 F: doc/guides/mempool/cnxk.rst
 
-Marvell OCTEON TX2
-M: Jerin Jacob <jerinj@marvell.com>
-M: Nithin Dabilpuram <ndabilpuram@marvell.com>
-F: drivers/common/octeontx2/
-F: drivers/mempool/octeontx2/
-F: doc/guides/platform/img/octeontx2_*
-F: doc/guides/platform/octeontx2.rst
-F: doc/guides/mempool/octeontx2.rst
-
 
 Bus Drivers
 -----------
@@ -568,6 +561,7 @@ F: drivers/bus/pci/
 
 VDEV bus driver
 F: drivers/bus/vdev/
+F: app/test/test_vdev.c
 
 VMBUS bus driver
 M: Stephen Hemminger <sthemmin@microsoft.com>
@@ -794,21 +788,6 @@ F: drivers/net/mvneta/
 F: doc/guides/nics/mvneta.rst
 F: doc/guides/nics/features/mvneta.ini
 
-Marvell OCTEON TX2
-M: Jerin Jacob <jerinj@marvell.com>
-M: Nithin Dabilpuram <ndabilpuram@marvell.com>
-M: Kiran Kumar K <kirankumark@marvell.com>
-T: git://dpdk.org/next/dpdk-next-net-mrvl
-F: drivers/net/octeontx2/
-F: doc/guides/nics/features/octeontx2*.ini
-F: doc/guides/nics/octeontx2.rst
-
-Marvell OCTEON TX2 - security
-M: Anoob Joseph <anoobj@marvell.com>
-T: git://dpdk.org/next/dpdk-next-crypto
-F: drivers/common/octeontx2/otx2_sec*
-F: drivers/net/octeontx2/otx2_ethdev_sec*
-
 Marvell OCTEON TX EP - endpoint
 M: Nalla Pradeep <pnalla@marvell.com>
 M: Radha Mohan Chintakuntla <radhac@marvell.com>
@@ -1114,13 +1093,6 @@ F: drivers/crypto/nitrox/
 F: doc/guides/cryptodevs/nitrox.rst
 F: doc/guides/cryptodevs/features/nitrox.ini
 
-Marvell OCTEON TX2 crypto
-M: Ankur Dwivedi <adwivedi@marvell.com>
-M: Anoob Joseph <anoobj@marvell.com>
-F: drivers/crypto/octeontx2/
-F: doc/guides/cryptodevs/octeontx2.rst
-F: doc/guides/cryptodevs/features/octeontx2.ini
-
 Mellanox mlx5
 M: Matan Azrad <matan@nvidia.com>
 F: drivers/crypto/mlx5/
@@ -1235,11 +1207,11 @@ F: doc/guides/dmadevs/dpaa.rst
 RegEx Drivers
 -------------
 
-Marvell OCTEON TX2 regex
+Marvell OCTEON CN9K regex
 M: Liron Himi <lironh@marvell.com>
-F: drivers/regex/octeontx2/
-F: doc/guides/regexdevs/octeontx2.rst
-F: doc/guides/regexdevs/features/octeontx2.ini
+F: drivers/regex/cn9k/
+F: doc/guides/regexdevs/cn9k.rst
+F: doc/guides/regexdevs/features/cn9k.ini
 
 Mellanox mlx5
 M: Ori Kam <orika@nvidia.com>
@@ -1297,12 +1269,6 @@ M: Shijith Thotton <sthotton@marvell.com>
 F: drivers/event/cnxk/
 F: doc/guides/eventdevs/cnxk.rst
 
-Marvell OCTEON TX2
-M: Pavan Nikhilesh <pbhagavatula@marvell.com>
-M: Jerin Jacob <jerinj@marvell.com>
-F: drivers/event/octeontx2/
-F: doc/guides/eventdevs/octeontx2.rst
-
 NXP DPAA eventdev
 M: Hemant Agrawal <hemant.agrawal@nxp.com>
 M: Nipun Gupta <nipun.gupta@nxp.com>
@@ -1690,8 +1656,10 @@ M: Reshma Pattan <reshma.pattan@intel.com>
 F: app/test/sample_packet_forward.c
 F: app/test/sample_packet_forward.h
 
-Driver testing tool
+Networking drivers testing tool
 M: Xiaoyun Li <xiaoyun.li@intel.com>
+M: Aman Singh <aman.deep.singh@intel.com>
+M: Yuying Zhang <yuying.zhang@intel.com>
 T: git://dpdk.org/next/dpdk-next-net
 F: app/test-pmd/
 F: doc/guides/testpmd_app_ug/
@@ -1785,11 +1753,6 @@ Link status interrupt example
 F: examples/link_status_interrupt/
 F: doc/guides/sample_app_ug/link_status_intr.rst
 
-L-threads - EXPERIMENTAL
-M: John McNamara <john.mcnamara@intel.com>
-F: examples/performance-thread/
-F: doc/guides/sample_app_ug/performance_thread.rst
-
 PTP client example
 M: Kirill Rybalchenko <kirill.rybalchenko@intel.com>
 F: examples/ptpclient/