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 A8A26A0096 for ; Wed, 5 Jun 2019 09:14:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 737CE1B945; Wed, 5 Jun 2019 09:13:59 +0200 (CEST) Received: from mail-vk1-f196.google.com (mail-vk1-f196.google.com [209.85.221.196]) by dpdk.org (Postfix) with ESMTP id 6B5FD559A for ; Wed, 5 Jun 2019 09:13:58 +0200 (CEST) Received: by mail-vk1-f196.google.com with SMTP id r23so4050249vkd.12 for ; Wed, 05 Jun 2019 00:13:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=e7AdoT3ZCn3dq9+EE5HOXNgwFQbv82bGBAXM+udsOZI=; b=f3I55rMJ3+LXgHoBCDjn6l/YR5kby2gULih4Wq7iYmalTq319DK0ZdRetmNjVpxjC4 hORBSt3oDBFryUPfdHSt0CiVRV0o4aqmvng1lMIRDKE5No7gCRKAyWUXNa/H8GwpP0gJ i7uMhVTjoA6LlS62fszpF0/x9igiFF94iTnjbHMZKZoCfrQWWo0IHTUYXx8TkDhMg0O1 hBRbPsdq6/uv98vzt6sByM1Gxzp2PNTqvafhvftYEebVZguiVyKr4W7yIGwF8ix6xbNq RPLaOoEb5rXfHbrRTi9AFedJK3CbQe1Af8ovTS4a5838ZqOthkqGtX+/95pV+r8KtGsp lFEw== X-Gm-Message-State: APjAAAV7t6EuH411HweFqSgk+N9Si4fZ0AeWGzSGbdS6rzME1pYMZjrU /1fvGpnoI+bmY4SymVhA0i2mkmxq4YnGA3ooDWKeWA== X-Google-Smtp-Source: APXvYqwab2s+JtCOUntkmfWVRBYVPD7QI4oq9T2jCs3D2rT465UlazvPBctk66CthD5Rp2sapk0i4WSVJozf5ZeeQGU= X-Received: by 2002:a1f:1bd0:: with SMTP id b199mr13960330vkb.85.1559718837783; Wed, 05 Jun 2019 00:13:57 -0700 (PDT) MIME-Version: 1.0 References: <20190604163147.105791-1-xiaolong.ye@intel.com> <20190605064910.GA111340@intel.com> In-Reply-To: <20190605064910.GA111340@intel.com> From: David Marchand Date: Wed, 5 Jun 2019 09:13:46 +0200 Message-ID: To: Ye Xiaolong Cc: Ferruh Yigit , dev , dpdk stable Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [dpdk-stable] [PATCH] eal: correct error log for alarm X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Wed, Jun 5, 2019 at 8:58 AM Ye Xiaolong wrote: > On 06/05, David Marchand wrote: > >Hello, > > > >On Tue, Jun 4, 2019 at 6:41 PM Xiaolong Ye wrote: > > > >> Fixes: af75078fece3 ("first public release") > >> Cc: stable@dpdk.org > >> > >> Signed-off-by: Xiaolong Ye > >> --- > >> lib/librte_eal/linux/eal/eal.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/lib/librte_eal/linux/eal/eal.c > >> b/lib/librte_eal/linux/eal/eal.c > >> index 161399619..10e2887ca 100644 > >> --- a/lib/librte_eal/linux/eal/eal.c > >> +++ b/lib/librte_eal/linux/eal/eal.c > >> @@ -1006,7 +1006,7 @@ 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.17.1 > >> > >> > >The same applies to freebsd eal. > > > >lib/librte_eal/freebsd/eal/eal.c: if (rte_eal_alarm_init() < 0) { > >lib/librte_eal/freebsd/eal/eal.c- rte_eal_init_alert("Cannot > >init interrupt-handling thread"); > > Er, yes, do I need to make another separate patch or just add the freebsd > fix > into this patch? > $ git fixline 764bf268 Fixes: 764bf26873b9 ("add FreeBSD support") $ git describe --contains 764bf268 v1.6.0r0~58 Both fixes are old enough to be relevant to the same stable branches (if we want to backport this), so you can add it to this patch yes. -- David Marchand