[dpdk-stable] patch 'maintainers: update Mellanox emails' has been queued to stable release 19.11.6

luca.boccassi at gmail.com luca.boccassi at gmail.com
Wed Oct 28 11:43:36 CET 2020


Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 0e5f3ccd1d3781865b60754737a7b3abac535c01 Mon Sep 17 00:00:00 2001
From: Ori Kam <orika at nvidia.com>
Date: Wed, 12 Aug 2020 16:08:35 +0000
Subject: [PATCH] maintainers: update Mellanox emails

[ upstream commit e9b17185e167f6ec64b240851e4459ae4ae05492 ]

This patch updates Mellanox maintainers mails from
the Mellanox domain to Nvidia domain.

Signed-off-by: Ori Kam <orika at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 MAINTAINERS | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 418f0f41f9..952ded7b00 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -46,7 +46,7 @@ M: Jerin Jacob <jerinj at marvell.com>
 T: git://dpdk.org/next/dpdk-next-net-mrvl
 
 Next-net-mlx Tree
-M: Raslan Darawsheh <rasland at mellanox.com>
+M: Raslan Darawsheh <rasland at nvidia.com>
 T: git://dpdk.org/next/dpdk-next-net-mlx
 
 Next-virtio Tree
@@ -373,7 +373,7 @@ F: devtools/test-null.sh
 F: doc/guides/prog_guide/switch_representation.rst
 
 Flow API
-M: Ori Kam <orika at mellanox.com>
+M: Ori Kam <orika at nvidia.com>
 T: git://dpdk.org/next/dpdk-next-net
 F: app/test-pmd/cmdline_flow.c
 F: doc/guides/prog_guide/rte_flow.rst
@@ -731,17 +731,17 @@ F: doc/guides/nics/features/octeontx2*.ini
 F: doc/guides/nics/octeontx2.rst
 
 Mellanox mlx4
-M: Matan Azrad <matan at mellanox.com>
-M: Shahaf Shuler <shahafs at mellanox.com>
+M: Matan Azrad <matan at nvidia.com>
+M: Shahaf Shuler <shahafs at nvidia.com>
 T: git://dpdk.org/next/dpdk-next-net-mlx
 F: drivers/net/mlx4/
 F: doc/guides/nics/mlx4.rst
 F: doc/guides/nics/features/mlx4.ini
 
 Mellanox mlx5
-M: Matan Azrad <matan at mellanox.com>
-M: Shahaf Shuler <shahafs at mellanox.com>
-M: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
+M: Matan Azrad <matan at nvidia.com>
+M: Shahaf Shuler <shahafs at nvidia.com>
+M: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
 T: git://dpdk.org/next/dpdk-next-net-mlx
 F: drivers/net/mlx5/
 F: buildtools/options-ibverbs-static.sh
@@ -749,7 +749,7 @@ F: doc/guides/nics/mlx5.rst
 F: doc/guides/nics/features/mlx5.ini
 
 Microsoft vdev_netvsc - EXPERIMENTAL
-M: Matan Azrad <matan at mellanox.com>
+M: Matan Azrad <matan at nvidia.com>
 F: drivers/net/vdev_netvsc/
 F: doc/guides/nics/vdev_netvsc.rst
 F: doc/guides/nics/features/vdev_netvsc.ini
@@ -1494,7 +1494,7 @@ M: Marko Kovacevic <marko.kovacevic at intel.com>
 F: examples/fips_validation/
 F: doc/guides/sample_app_ug/fips_validation.rst
 
-M: Ori Kam <orika at mellanox.com>
+M: Ori Kam <orika at nvidia.com>
 F: examples/flow_filtering/
 F: doc/guides/sample_app_ug/flow_filtering.rst
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:13.554072142 +0000
+++ 0057-maintainers-update-Mellanox-emails.patch	2020-10-28 10:35:11.524830318 +0000
@@ -1,24 +1,24 @@
-From e9b17185e167f6ec64b240851e4459ae4ae05492 Mon Sep 17 00:00:00 2001
+From 0e5f3ccd1d3781865b60754737a7b3abac535c01 Mon Sep 17 00:00:00 2001
 From: Ori Kam <orika at nvidia.com>
 Date: Wed, 12 Aug 2020 16:08:35 +0000
 Subject: [PATCH] maintainers: update Mellanox emails
 
+[ upstream commit e9b17185e167f6ec64b240851e4459ae4ae05492 ]
+
 This patch updates Mellanox maintainers mails from
 the Mellanox domain to Nvidia domain.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Ori Kam <orika at nvidia.com>
 Acked-by: Matan Azrad <matan at nvidia.com>
 ---
- MAINTAINERS | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
+ MAINTAINERS | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 6dbea330f9..3835818ef4 100644
+index 418f0f41f9..952ded7b00 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -45,7 +45,7 @@ M: Jerin Jacob <jerinj at marvell.com>
+@@ -46,7 +46,7 @@ M: Jerin Jacob <jerinj at marvell.com>
  T: git://dpdk.org/next/dpdk-next-net-mrvl
  
  Next-net-mlx Tree
@@ -36,17 +36,8 @@
  T: git://dpdk.org/next/dpdk-next-net
  F: app/test-pmd/cmdline_flow.c
  F: doc/guides/prog_guide/rte_flow.rst
-@@ -427,7 +427,7 @@ F: doc/guides/prog_guide/compressdev.rst
- F: doc/guides/compressdevs/features/default.ini
- 
- RegEx API - EXPERIMENTAL
--M: Ori Kam <orika at mellanox.com>
-+M: Ori Kam <orika at nvidia.com>
- F: lib/librte_regexdev/
- F: app/test-regex/
- F: doc/guides/prog_guide/regexdev.rst
-@@ -749,17 +749,17 @@ F: drivers/common/octeontx2/otx2_sec*
- F: drivers/net/octeontx2/otx2_ethdev_sec*
+@@ -731,17 +731,17 @@ F: doc/guides/nics/features/octeontx2*.ini
+ F: doc/guides/nics/octeontx2.rst
  
  Mellanox mlx4
 -M: Matan Azrad <matan at mellanox.com>
@@ -66,9 +57,9 @@
 +M: Shahaf Shuler <shahafs at nvidia.com>
 +M: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
  T: git://dpdk.org/next/dpdk-next-net-mlx
- F: drivers/common/mlx5/
  F: drivers/net/mlx5/
-@@ -768,7 +768,7 @@ F: doc/guides/nics/mlx5.rst
+ F: buildtools/options-ibverbs-static.sh
+@@ -749,7 +749,7 @@ F: doc/guides/nics/mlx5.rst
  F: doc/guides/nics/features/mlx5.ini
  
  Microsoft vdev_netvsc - EXPERIMENTAL
@@ -76,37 +67,8 @@
 +M: Matan Azrad <matan at nvidia.com>
  F: drivers/net/vdev_netvsc/
  F: doc/guides/nics/vdev_netvsc.rst
- 
-@@ -1113,7 +1113,7 @@ RegEx Drivers
- -------------
- 
- Mellanox mlx5
--M: Ori Kam <orika at mellanox.com>
-+M: Ori Kam <orika at nvidia.com>
- F: drivers/regex/mlx5/
- F: doc/guides/regexdevs/mlx5.rst
- F: doc/guides/regexdevs/features/mlx5.ini
-@@ -1130,8 +1130,8 @@ F: doc/guides/vdpadevs/ifc.rst
- F: doc/guides/vdpadevs/features/ifcvf.ini
- 
- Mellanox mlx5 vDPA
--M: Matan Azrad <matan at mellanox.com>
--M: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
-+M: Matan Azrad <matan at nvidia.com>
-+M: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
- F: drivers/vdpa/mlx5/
- F: doc/guides/vdpadevs/mlx5.rst
- F: doc/guides/vdpadevs/features/mlx5.ini
-@@ -1529,7 +1529,7 @@ F: app/test-pmd/
- F: doc/guides/testpmd_app_ug/
- 
- Flow performance tool
--M: Wisam Jaddo <wisamm at mellanox.com>
-+M: Wisam Jaddo <wisamm at nvidia.com>
- F: app/test-flow-perf/
- F: doc/guides/tools/flow-perf.rst
- 
-@@ -1569,7 +1569,7 @@ M: Marko Kovacevic <marko.kovacevic at intel.com>
+ F: doc/guides/nics/features/vdev_netvsc.ini
+@@ -1494,7 +1494,7 @@ M: Marko Kovacevic <marko.kovacevic at intel.com>
  F: examples/fips_validation/
  F: doc/guides/sample_app_ug/fips_validation.rst
  


More information about the stable mailing list