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 D7E51A046B for ; Tue, 23 Jul 2019 03:03:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D14BC1BEF8; Tue, 23 Jul 2019 03:03:15 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 7974E1BEF8 for ; Tue, 23 Jul 2019 03:03:14 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:03:12 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11Hfn026580; Tue, 23 Jul 2019 04:03:11 +0300 From: Yongseok Koh To: Stephen Hemminger Cc: Rami Rosen , dpdk stable Date: Mon, 22 Jul 2019 18:00:30 -0700 Message-Id: <20190723010115.6446-63-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ring: fix an error message' has been queued to LTS release 17.11.7 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 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. 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. Yongseok --- >From d407cbcdaf76a63af74c488e6ae15778e8bc409d 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 036467f4e4..2d5148d35e 100644 --- a/lib/librte_ring/rte_ring.c +++ b/lib/librte_ring/rte_ring.c @@ -245,7 +245,8 @@ rte_ring_free(struct rte_ring *r) * therefore, there is no memzone to free. */ 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.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:09.873409668 -0700 +++ 0063-ring-fix-an-error-message.patch 2019-07-22 17:55:06.191471000 -0700 @@ -1,8 +1,10 @@ -From c0c055f5f773adca467d256298d8e777024f085f Mon Sep 17 00:00:00 2001 +From d407cbcdaf76a63af74c488e6ae15778e8bc409d 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") @@ -14,10 +16,10 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c -index d215aceccf..550549db39 100644 +index 036467f4e4..2d5148d35e 100644 --- a/lib/librte_ring/rte_ring.c +++ b/lib/librte_ring/rte_ring.c -@@ -189,7 +189,8 @@ rte_ring_free(struct rte_ring *r) +@@ -245,7 +245,8 @@ rte_ring_free(struct rte_ring *r) * therefore, there is no memzone to free. */ if (r->memzone == NULL) {