From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A79E41B921 for ; Fri, 14 Dec 2018 19:25:54 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 18C1AA6DFA; Fri, 14 Dec 2018 18:25:54 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00BAF600C0; Fri, 14 Dec 2018 18:25:52 +0000 (UTC) From: Kevin Traynor To: Fan Zhang Cc: Maxime Coquelin , dpdk stable Date: Fri, 14 Dec 2018 18:24:28 +0000 Message-Id: <20181214182430.11593-26-ktraynor@redhat.com> In-Reply-To: <20181214182430.11593-1-ktraynor@redhat.com> References: <20181214182430.11593-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 14 Dec 2018 18:25:54 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/vhost_crypto: fix bracket' has been queued to stable release 18.11.1 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: , X-List-Received-Date: Fri, 14 Dec 2018 18:25:54 -0000 Hi, FYI, your patch has been queued to stable release 18.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/18/18. 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. Kevin Traynor --- >>From b3013022e7c144df6030137d8116734a2784d407 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 11 Dec 2018 15:09:51 +0000 Subject: [PATCH] examples/vhost_crypto: fix bracket [ upstream commit 57f9a9fc3c54aaae838698d846fb124836900c7a ] This patch fixes a missed bracket bug in the code. Fixes: e1d90eaa83ff ("examples/vhost_crypto: fix zero copy") Signed-off-by: Fan Zhang Reviewed-by: Maxime Coquelin --- examples/vhost_crypto/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/vhost_crypto/main.c b/examples/vhost_crypto/main.c index f08babd97..3deb5263f 100644 --- a/examples/vhost_crypto/main.c +++ b/examples/vhost_crypto/main.c @@ -504,9 +504,10 @@ main(int argc, char *argv[]) RTE_STR(VHOST_CRYPTO_CDEV_NAME_AESNI_MB_PMD)) || strstr(dev_info.driver_name, - RTE_STR(VHOST_CRYPTO_CDEV_NAME_AESNI_GCM_PMD))) - RTE_LOG(ERR, USER1, "Cannot enable zero-copy in %s\n", + RTE_STR(VHOST_CRYPTO_CDEV_NAME_AESNI_GCM_PMD))) { + RTE_LOG(ERR, USER1, "Cannot enable zero-copy in %s\n", dev_info.driver_name); - ret = -EPERM; - goto error_exit; + ret = -EPERM; + goto error_exit; + } } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-12-14 18:23:18.979291415 +0000 +++ 0026-examples-vhost_crypto-fix-bracket.patch 2018-12-14 18:23:18.000000000 +0000 @@ -1,12 +1,13 @@ -From 57f9a9fc3c54aaae838698d846fb124836900c7a Mon Sep 17 00:00:00 2001 +From b3013022e7c144df6030137d8116734a2784d407 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 11 Dec 2018 15:09:51 +0000 Subject: [PATCH] examples/vhost_crypto: fix bracket +[ upstream commit 57f9a9fc3c54aaae838698d846fb124836900c7a ] + This patch fixes a missed bracket bug in the code. Fixes: e1d90eaa83ff ("examples/vhost_crypto: fix zero copy") -Cc: stable@dpdk.org Signed-off-by: Fan Zhang Reviewed-by: Maxime Coquelin