From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B88E9A04B1 for ; Fri, 28 Aug 2020 12:14:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B13ACA3; Fri, 28 Aug 2020 12:14:44 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id EE55E1C11A for ; Fri, 28 Aug 2020 12:14:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yC6s+wbKXqRna2/W/9qJjpZh5SJeAxldER6EjrPW+Ls=; b=NlkrQmQAaNM72NwwT9E4RAgXlqqSf35I+/uhvFAc4nv+xCH4nHsTs8amcwg4KKOh5Pj04g s9Bcz7R3C9+lm4fSw1Z0OkrVfBkqhLe0ZiYxn7SsGkPjcxsKx6R0sY0x+JVDfgyDseCxTR mD2hHqcmn7Sy20Y3fpl0stcWUuFBPEU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-14-Fm429K6GOt2jUfhvsAKZ_w-1; Fri, 28 Aug 2020 06:14:39 -0400 X-MC-Unique: Fm429K6GOt2jUfhvsAKZ_w-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9FCD1DDE8; Fri, 28 Aug 2020 10:14:38 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99A4F19D7C; Fri, 28 Aug 2020 10:14:37 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Bruce Richardson , John McNamara , dpdk stable Date: Fri, 28 Aug 2020 11:13:07 +0100 Message-Id: <20200828101308.223767-41-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'kni: fix reference to master/slave process' has been queued to LTS release 18.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Bruce Richardson Acked-by: John McNamara --- 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@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);