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 A964BA0613 for ; Tue, 27 Aug 2019 11:31:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A0B2354AE; Tue, 27 Aug 2019 11:31:14 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 4735D54AE for ; Tue, 27 Aug 2019 11:31:13 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BAF9C308218D; Tue, 27 Aug 2019 09:31:12 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE2895C1B2; Tue, 27 Aug 2019 09:31:11 +0000 (UTC) From: Kevin Traynor To: Thierry Herbelot Cc: Akhil Goyal , dpdk stable Date: Tue, 27 Aug 2019 10:29:58 +0100 Message-Id: <20190827093032.20423-21-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 27 Aug 2019 09:31:12 +0000 (UTC) Subject: [dpdk-stable] patch 'drivers: fix typo in NXP comments' has been queued to LTS release 18.11.3 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.3 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/03/19. 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/1eec32d234e8d35a05e5984dd42a273d2c9a1788 Thanks. Kevin Traynor --- >From 1eec32d234e8d35a05e5984dd42a273d2c9a1788 Mon Sep 17 00:00:00 2001 From: Thierry Herbelot Date: Wed, 22 May 2019 11:44:49 +0200 Subject: [PATCH] drivers: fix typo in NXP comments [ upstream commit a1f42a9dd7c6443853c92f4ca587d0c8e5ec5f94 ] Fix another copy'n'paste typo. Fixes: 531b17a780dc ("bus/fslmc: add QBMAN driver to bus") Fixes: 6ef6beca8844 ("crypto/caam_jr: add enqueue/dequeue operations") Fixes: c3e85bdcc6e6 ("crypto/dpaa_sec: add crypto driver for NXP DPAA platform") Signed-off-by: Thierry Herbelot Acked-by: Akhil Goyal --- drivers/bus/fslmc/qbman/include/fsl_qbman_portal.h | 2 +- drivers/crypto/caam_jr/caam_jr.c | 2 +- drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/bus/fslmc/qbman/include/fsl_qbman_portal.h b/drivers/bus/fslmc/qbman/include/fsl_qbman_portal.h index 10c72e048..00b353a2b 100644 --- a/drivers/bus/fslmc/qbman/include/fsl_qbman_portal.h +++ b/drivers/bus/fslmc/qbman/include/fsl_qbman_portal.h @@ -16,5 +16,5 @@ * command etc. * - Dequeue, including setting the dequeue descriptor, issuing dequeue command, - * parsing the dequeue response in DQRR and memeory, parsing the state change + * parsing the dequeue response in DQRR and memory, parsing the state change * notifications etc. * - Release, including setting the release descriptor, and issuing the buffer diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c index efc69b6eb..a4e70babf 100644 --- a/drivers/crypto/caam_jr/caam_jr.c +++ b/drivers/crypto/caam_jr/caam_jr.c @@ -71,5 +71,5 @@ caam_jr_op_ending(struct caam_jr_op_ctx *ctx) { PMD_INIT_FUNC_TRACE(); - /* report op status to sym->op and then free the ctx memeory */ + /* report op status to sym->op and then free the ctx memory */ rte_mempool_put(ctx->ctx_pool, (void *)ctx); } diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 10201c58c..742e24c52 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -61,5 +61,5 @@ dpaa_sec_op_ending(struct dpaa_sec_op_ctx *ctx) } - /* report op status to sym->op and then free the ctx memeory */ + /* report op status to sym->op and then free the ctx memory */ rte_mempool_put(ctx->ctx_pool, (void *)ctx); } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:12.064718213 +0100 +++ 0021-drivers-fix-typo-in-NXP-comments.patch 2019-08-27 09:40:10.904144777 +0100 @@ -1 +1 @@ -From a1f42a9dd7c6443853c92f4ca587d0c8e5ec5f94 Mon Sep 17 00:00:00 2001 +From 1eec32d234e8d35a05e5984dd42a273d2c9a1788 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a1f42a9dd7c6443853c92f4ca587d0c8e5ec5f94 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 07b8a4372..c35dafedb 100644 +index 10c72e048..00b353a2b 100644 @@ -33 +34 @@ -index 5028bd2a4..77c030347 100644 +index efc69b6eb..a4e70babf 100644 @@ -44 +45 @@ -index d9a7cd8a4..122c80a07 100644 +index 10201c58c..742e24c52 100644 @@ -47 +48 @@ -@@ -62,5 +62,5 @@ dpaa_sec_op_ending(struct dpaa_sec_op_ctx *ctx) +@@ -61,5 +61,5 @@ dpaa_sec_op_ending(struct dpaa_sec_op_ctx *ctx)