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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/61a4229f8abd941982a7e3e489896826aabfa7f3

Thanks.

Kevin.

---
>From 61a4229f8abd941982a7e3e489896826aabfa7f3 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 d44496c712..ef14dc2a69 100644
--- a/lib/librte_kni/rte_kni.h
+++ b/lib/librte_kni/rte_kni.h
@@ -208,5 +208,5 @@ 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
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.880266638 +0100
+++ 0041-kni-fix-reference-to-master-slave-process.patch	2020-08-28 11:03:25.994955996 +0100
@@ -1 +1 @@
-From 95a2e18dfbd3468a0614d3ca207e086c0b0f822b Mon Sep 17 00:00:00 2001
+From 61a4229f8abd941982a7e3e489896826aabfa7f3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 95a2e18dfbd3468a0614d3ca207e086c0b0f822b ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index f1bb782c68..855facd1a3 100644
+index d44496c712..ef14dc2a69 100644
@@ -23 +24 @@
-@@ -213,5 +213,5 @@ const char *rte_kni_get_name(const struct rte_kni *kni);
+@@ -208,5 +208,5 @@ const char *rte_kni_get_name(const struct rte_kni *kni);