From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 37AE1A00E6 for ; Tue, 14 May 2019 16:44:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1AABC5B2A; Tue, 14 May 2019 16:44:51 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id B0EAD5B2A for ; Tue, 14 May 2019 16:44:49 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 15E6D30BDE5C; Tue, 14 May 2019 14:44:44 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-124.ams2.redhat.com [10.36.116.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 002EF6E3F3; Tue, 14 May 2019 14:44:40 +0000 (UTC) From: Kevin Traynor To: David Christensen Cc: Konstantin Ananyev , dpdk stable Date: Tue, 14 May 2019 15:43:53 +0100 Message-Id: <20190514144406.7526-9-ktraynor@redhat.com> In-Reply-To: <20190514144406.7526-1-ktraynor@redhat.com> References: <20190514144406.7526-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 14 May 2019 14:44:44 +0000 (UTC) Subject: [dpdk-stable] patch 'test/barrier: fix typo in log' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/20/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/087ea6e13eeb699e071429574108983fa0218f89 Thanks. Kevin Traynor --- >From 087ea6e13eeb699e071429574108983fa0218f89 Mon Sep 17 00:00:00 2001 From: David Christensen Date: Wed, 8 May 2019 16:02:08 -0500 Subject: [PATCH] test/barrier: fix typo in log [ upstream commit 834e4896a5a24d8fae72e9ad3f83bac2a537f8b8 ] Change "much" to "match" in a printf. Fixes: 93da5b59afc9 ("test: introduce memory barrier test case") Signed-off-by: David Christensen Acked-by: Konstantin Ananyev --- test/test/test_barrier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test/test_barrier.c b/test/test/test_barrier.c index 82b572c3e..c219d5602 100644 --- a/test/test/test_barrier.c +++ b/test/test/test_barrier.c @@ -253,5 +253,5 @@ plock_test(uint32_t iter, enum plock_use_type utype) /* race condition occurred, lock doesn't work properly */ if (sum[i] != pt[i].val || 2 * iter != pt[i].iter) { - printf("error: local and shared sums don't much\n"); + printf("error: local and shared sums don't match\n"); rc = -1; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-14 15:39:07.743229964 +0100 +++ 0009-test-barrier-fix-typo-in-log.patch 2019-05-14 15:39:07.306558951 +0100 @@ -1 +1 @@ -From 834e4896a5a24d8fae72e9ad3f83bac2a537f8b8 Mon Sep 17 00:00:00 2001 +From 087ea6e13eeb699e071429574108983fa0218f89 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 834e4896a5a24d8fae72e9ad3f83bac2a537f8b8 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - app/test/test_barrier.c | 2 +- + test/test/test_barrier.c | 2 +- @@ -17 +18 @@ -diff --git a/app/test/test_barrier.c b/app/test/test_barrier.c +diff --git a/test/test/test_barrier.c b/test/test/test_barrier.c @@ -19,2 +20,2 @@ ---- a/app/test/test_barrier.c -+++ b/app/test/test_barrier.c +--- a/test/test/test_barrier.c ++++ b/test/test/test_barrier.c