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 6FB1DA05D3 for ; Thu, 25 Apr 2019 17:41:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5215A1B5F0; Thu, 25 Apr 2019 17:41:44 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A0EEC1B5C4 for ; Thu, 25 Apr 2019 17:41:43 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 147BF59442; Thu, 25 Apr 2019 15:41:43 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07E4A5D9D1; Thu, 25 Apr 2019 15:41:41 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Rami Rosen , dpdk stable Date: Thu, 25 Apr 2019 16:40:12 +0100 Message-Id: <20190425154037.28778-37-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 25 Apr 2019 15:41:43 +0000 (UTC) Subject: [dpdk-stable] patch 'ring: fix an error message' 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/01/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 can be viewed on the 18.11 branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 7837e3e8b704f7b5d1383497c63d871db345864c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 2 Apr 2019 08:30:26 -0700 Subject: [PATCH] ring: fix an error message [ upstream commit c0c055f5f773adca467d256298d8e777024f085f ] Log message should end with newline. Fixes: 4e32101f9b01 ("ring: support freeing") Signed-off-by: Stephen Hemminger Reviewed-by: Rami Rosen --- lib/librte_ring/rte_ring.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c index d215acecc..550549db3 100644 --- a/lib/librte_ring/rte_ring.c +++ b/lib/librte_ring/rte_ring.c @@ -190,5 +190,6 @@ rte_ring_free(struct rte_ring *r) */ if (r->memzone == NULL) { - RTE_LOG(ERR, RING, "Cannot free ring (not created with rte_ring_create()"); + RTE_LOG(ERR, RING, + "Cannot free ring, not created with rte_ring_create()\n"); return; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-25 16:37:48.354963733 +0100 +++ 0037-ring-fix-an-error-message.patch 2019-04-25 16:37:46.746294926 +0100 @@ -1 +1 @@ -From c0c055f5f773adca467d256298d8e777024f085f Mon Sep 17 00:00:00 2001 +From 7837e3e8b704f7b5d1383497c63d871db345864c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,2 @@ + +[ upstream commit c0c055f5f773adca467d256298d8e777024f085f ]