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 7BE16A046B for ; Fri, 23 Aug 2019 11:44:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 701D31BF9B; Fri, 23 Aug 2019 11:44:03 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id AEA6F1BF9B for ; Fri, 23 Aug 2019 11:44:01 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2CF6910C696B; Fri, 23 Aug 2019 09:44:01 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59A315C226; Fri, 23 Aug 2019 09:43:57 +0000 (UTC) From: Kevin Traynor To: Xiaolong Ye Cc: David Marchand , dpdk stable Date: Fri, 23 Aug 2019 10:42:53 +0100 Message-Id: <20190823094336.12078-3-ktraynor@redhat.com> In-Reply-To: <20190823094336.12078-1-ktraynor@redhat.com> References: <20190823094336.12078-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Fri, 23 Aug 2019 09:44:01 +0000 (UTC) Subject: [dpdk-stable] patch 'eal: correct log for alarm error' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/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/b11bc87c685e469e39ecec3dc5c70b75b544c52b Thanks. Kevin Traynor --- >From b11bc87c685e469e39ecec3dc5c70b75b544c52b Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Wed, 5 Jun 2019 15:18:29 +0800 Subject: [PATCH] eal: correct log for alarm error [ upstream commit 4142b06e2d60734eb7f6dda5edc212993c461f0a ] Fixes: af75078fece3 ("first public release") Fixes: 764bf26873b9 ("add FreeBSD support") Signed-off-by: Xiaolong Ye Reviewed-by: David Marchand --- lib/librte_eal/bsdapp/eal/eal.c | 2 +- lib/librte_eal/linuxapp/eal/eal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index bfac7fdc9..cfaa87a48 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -664,5 +664,5 @@ rte_eal_init(int argc, char **argv) if (rte_eal_alarm_init() < 0) { - rte_eal_init_alert("Cannot init interrupt-handling thread"); + rte_eal_init_alert("Cannot init alarm"); /* rte_eal_alarm_init sets rte_errno on failure. */ return -1; diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 7a08cf1ec..fa97b1154 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -1002,5 +1002,5 @@ rte_eal_init(int argc, char **argv) if (rte_eal_alarm_init() < 0) { - rte_eal_init_alert("Cannot init interrupt-handling thread"); + rte_eal_init_alert("Cannot init alarm"); /* rte_eal_alarm_init sets rte_errno on failure. */ return -1; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-22 19:38:20.659525287 +0100 +++ 0003-eal-correct-log-for-alarm-error.patch 2019-08-22 19:38:20.395027881 +0100 @@ -1 +1 @@ -From 4142b06e2d60734eb7f6dda5edc212993c461f0a Mon Sep 17 00:00:00 2001 +From b11bc87c685e469e39ecec3dc5c70b75b544c52b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4142b06e2d60734eb7f6dda5edc212993c461f0a ] + @@ -8 +9,0 @@ -Cc: stable@dpdk.org @@ -13,2 +14,2 @@ - lib/librte_eal/freebsd/eal/eal.c | 2 +- - lib/librte_eal/linux/eal/eal.c | 2 +- + lib/librte_eal/bsdapp/eal/eal.c | 2 +- + lib/librte_eal/linuxapp/eal/eal.c | 2 +- @@ -17,5 +18,5 @@ -diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c -index 97633a55a..1364d55c9 100644 ---- a/lib/librte_eal/freebsd/eal/eal.c -+++ b/lib/librte_eal/freebsd/eal/eal.c -@@ -695,5 +695,5 @@ rte_eal_init(int argc, char **argv) +diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c +index bfac7fdc9..cfaa87a48 100644 +--- a/lib/librte_eal/bsdapp/eal/eal.c ++++ b/lib/librte_eal/bsdapp/eal/eal.c +@@ -664,5 +664,5 @@ rte_eal_init(int argc, char **argv) @@ -28,5 +29,5 @@ -diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c -index d96ed3a7c..dfbbeddc4 100644 ---- a/lib/librte_eal/linux/eal/eal.c -+++ b/lib/librte_eal/linux/eal/eal.c -@@ -1046,5 +1046,5 @@ rte_eal_init(int argc, char **argv) +diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c +index 7a08cf1ec..fa97b1154 100644 +--- a/lib/librte_eal/linuxapp/eal/eal.c ++++ b/lib/librte_eal/linuxapp/eal/eal.c +@@ -1002,5 +1002,5 @@ rte_eal_init(int argc, char **argv)