[dpdk-stable] patch 'kni: fix reference to master/slave process' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/12/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 984aa9cc565aadaf36439bbb4d6f9f8bb2d4dff8 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Thu, 6 Aug 2020 10:19:43 -0700
Subject: [PATCH] kni: fix reference to master/slave process

[ upstream commit 95a2e18dfbd3468a0614d3ca207e086c0b0f822b ]

In DPDK, the correct terms for process are primary/secondary.
This is bugfix, not a change in terms for new release.

Fixes: f2e7592c474c ("kni: fix multi-process support")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: John McNamara <john.mcnamara at intel.com>
---
 lib/librte_kni/rte_kni.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
index f1bb782c6..855facd1a 100644
--- a/lib/librte_kni/rte_kni.h
+++ b/lib/librte_kni/rte_kni.h
@@ -212,7 +212,7 @@ const char *rte_kni_get_name(const struct rte_kni *kni);
 
 /**
  * Register KNI request handling for a specified port,and it can
- * be called by master process or slave process.
+ * be called by primary process or secondary process.
  *
  * @param kni
  *  pointer to struct rte_kni.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-10 12:04:18.390310640 +0100
+++ 0001-kni-fix-reference-to-master-slave-process.patch	2020-08-10 12:04:18.347555497 +0100
@@ -1,13 +1,14 @@
-From 95a2e18dfbd3468a0614d3ca207e086c0b0f822b Mon Sep 17 00:00:00 2001
+From 984aa9cc565aadaf36439bbb4d6f9f8bb2d4dff8 Mon Sep 17 00:00:00 2001
 From: Stephen Hemminger <stephen at networkplumber.org>
 Date: Thu, 6 Aug 2020 10:19:43 -0700
 Subject: [PATCH] kni: fix reference to master/slave process
 
+[ upstream commit 95a2e18dfbd3468a0614d3ca207e086c0b0f822b ]
+
 In DPDK, the correct terms for process are primary/secondary.
 This is bugfix, not a change in terms for new release.
 
 Fixes: f2e7592c474c ("kni: fix multi-process support")
-Cc: stable at dpdk.org
 
 Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
 Acked-by: Bruce Richardson <bruce.richardson at intel.com>