From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 63FB9A0A02 for ; Mon, 17 May 2021 18:15:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5EE20410E0; Mon, 17 May 2021 18:15:40 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 5223140041 for ; Mon, 17 May 2021 18:15:38 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifu4-0008Ec-BH; Mon, 17 May 2021 16:15:36 +0000 From: Christian Ehrhardt To: "Min Hu (Connor)" Cc: Konstantin Ananyev , dpdk stable Date: Mon, 17 May 2021 18:09:15 +0200 Message-Id: <20210517161039.3132619-126-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/bpf: fix error message' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 stable release 19.11.9 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/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/c0be59c04371efa09e71a1186ab6ec029f239a47 Thanks. Christian Ehrhardt --- >From c0be59c04371efa09e71a1186ab6ec029f239a47 Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Wed, 21 Apr 2021 19:36:53 +0800 Subject: [PATCH] test/bpf: fix error message [ upstream commit 7eff355b6983872ce4d2817ea8017d21320489e1 ] This patch fixed wrong error variable in logging message. Fixes: 83633ba23076 ("test/bpf: fix few small issues") Signed-off-by: Min Hu (Connor) Acked-by: Konstantin Ananyev --- app/test/test_bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c index 4a61a7d7cb..88048b4644 100644 --- a/app/test/test_bpf.c +++ b/app/test/test_bpf.c @@ -2744,7 +2744,7 @@ run_test(const struct bpf_test *tst) printf("%s@%d: check_result(%s) failed, " "error: %d(%s);\n", __func__, __LINE__, tst->name, - rv, strerror(ret)); + rv, strerror(rv)); } } -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:34.349517242 +0200 +++ 0126-test-bpf-fix-error-message.patch 2021-05-17 17:40:29.351810894 +0200 @@ -1 +1 @@ -From 7eff355b6983872ce4d2817ea8017d21320489e1 Mon Sep 17 00:00:00 2001 +From c0be59c04371efa09e71a1186ab6ec029f239a47 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7eff355b6983872ce4d2817ea8017d21320489e1 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 7c3de96c62..527c06b807 100644 +index 4a61a7d7cb..88048b4644 100644 @@ -21 +22 @@ -@@ -3207,7 +3207,7 @@ run_test(const struct bpf_test *tst) +@@ -2744,7 +2744,7 @@ run_test(const struct bpf_test *tst)