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 805ECA0518 for ; Fri, 24 Jul 2020 14:03:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7642B1C02D; Fri, 24 Jul 2020 14:03:47 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id AEA0C1C02D for ; Fri, 24 Jul 2020 14:03:46 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id f18so8099923wrs.0 for ; Fri, 24 Jul 2020 05:03:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vft4CniL+nUoBujIkVzD4rBpIp+Jhuhl664ao/2RsgE=; b=j8cilug4ZVB7i+oLxv0XYSo9RY8OBpgbexK3qUCmtdvh30RjPa0R711mS0RsZj6tfu g9e2h/D4hGKpw1E+PssliMyVlZox8fbvKoZktkFo9y0sVtk73HXnNxcPRB/Gn7T45Ak/ tvKWP7qtwaBOqRiD0zf2981YdXM1PtGn9RazaWtdB/6WKOdD7z1eMWA1g4T2vQqQAZiM yBvTIJCSVsIdLiyJRTIfpiyXqRFxM8gYrreiLzImo13N+oNPpqa8BuTntyKolb4NlamB ov1G7l47AG2pc5b2hxu8RVE3pYjzZW0CicvoXbl59+x+RJdozk93UPQnRFd7wvSh1+Lr 1m+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vft4CniL+nUoBujIkVzD4rBpIp+Jhuhl664ao/2RsgE=; b=XxU1rm4k27StlmKMxEi8CfYeH77w+5xmgwb/HeibozwkjqZB1xIfDUSaEN2e0OjnqZ HXkRiu1dETbI3xX9ks7TX1HI9FIzBiMcMv0n7cnwVkl4M5ltBKayTTiAjr5Qm4GyeUT7 +6fBvaAM/qxcZYbGeYrzi+9wA6+NQXCB4xEZirJ2+AdsGngvEa4IusHdJLCr73pqLTHV HxFGwvn88k0XBSbMzrrNYDx1IAxn84MOXoRgZwzqfqc6548WAw9HoGMimbETQmX5ndpH H/AtMoF4CvENqx148kYRtBcBrEyMKyqEMHvVDXUlbEk36Wymdo90PnlwBgQNd6TJU2zH 9Abw== X-Gm-Message-State: AOAM5310g7uL/JEb+qyPefEjg3YXaqVxYoHT2qcNoZSXLksqurxZh5TK NlVKkAEuGKFvnWbwi44c+rVykrPbn3FAKg== X-Google-Smtp-Source: ABdhPJxE/No6CzQ6kUAvMITGtXx+QDZGON0lYBM8OSvqz7GVFAMFzQdzUjXH9hgnbzk4NaNF7lHpUA== X-Received: by 2002:adf:b74b:: with SMTP id n11mr8205492wre.310.1595592226419; Fri, 24 Jul 2020 05:03:46 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u20sm6818056wmc.42.2020.07.24.05.03.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:03:45 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Ferruh Yigit , dpdk stable Date: Fri, 24 Jul 2020 12:58:08 +0100 Message-Id: <20200724120030.1863487-50-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal: remove redundant newline in alert message' has been queued to stable release 19.11.4 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 stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. 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. Thanks. Luca Boccassi --- >From d5daa8c70fe9976df76a5f7908dc7540b042791c Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 10 Jun 2020 16:30:24 +0200 Subject: [PATCH] eal: remove redundant newline in alert message [ upstream commit d58314aa3ccb57776fbc6d27d024cce4097dd619 ] rte_eal_init_alert() already appends a newline. Fixes: 0a529578f162 ("eal: clean up unused files on initialization") Signed-off-by: David Marchand Reviewed-by: Ferruh Yigit --- lib/librte_eal/freebsd/eal/eal.c | 2 +- lib/librte_eal/linux/eal/eal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c index 6ae37e7e6..2a995ee3f 100644 --- a/lib/librte_eal/freebsd/eal/eal.c +++ b/lib/librte_eal/freebsd/eal/eal.c @@ -949,7 +949,7 @@ rte_eal_init(int argc, char **argv) * place, so no cleanup needed. */ if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) { - rte_eal_init_alert("Cannot clear runtime directory\n"); + rte_eal_init_alert("Cannot clear runtime directory"); return -1; } diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c index e6d4cc717..8f1bcab39 100644 --- a/lib/librte_eal/linux/eal/eal.c +++ b/lib/librte_eal/linux/eal/eal.c @@ -1288,7 +1288,7 @@ rte_eal_init(int argc, char **argv) * place, so no cleanup needed. */ if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) { - rte_eal_init_alert("Cannot clear runtime directory\n"); + rte_eal_init_alert("Cannot clear runtime directory"); return -1; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:50.538024271 +0100 +++ 0050-eal-remove-redundant-newline-in-alert-message.patch 2020-07-24 12:53:48.271006162 +0100 @@ -1,25 +1,26 @@ -From d58314aa3ccb57776fbc6d27d024cce4097dd619 Mon Sep 17 00:00:00 2001 +From d5daa8c70fe9976df76a5f7908dc7540b042791c Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 10 Jun 2020 16:30:24 +0200 Subject: [PATCH] eal: remove redundant newline in alert message +[ upstream commit d58314aa3ccb57776fbc6d27d024cce4097dd619 ] + rte_eal_init_alert() already appends a newline. Fixes: 0a529578f162 ("eal: clean up unused files on initialization") -Cc: stable@dpdk.org Signed-off-by: David Marchand Reviewed-by: Ferruh Yigit --- - lib/librte_eal/freebsd/eal.c | 2 +- - lib/librte_eal/linux/eal.c | 2 +- + lib/librte_eal/freebsd/eal/eal.c | 2 +- + lib/librte_eal/linux/eal/eal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c -index c41f265fa..00fc66bf7 100644 ---- a/lib/librte_eal/freebsd/eal.c -+++ b/lib/librte_eal/freebsd/eal.c -@@ -952,7 +952,7 @@ rte_eal_init(int argc, char **argv) +diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c +index 6ae37e7e6..2a995ee3f 100644 +--- a/lib/librte_eal/freebsd/eal/eal.c ++++ b/lib/librte_eal/freebsd/eal/eal.c +@@ -949,7 +949,7 @@ rte_eal_init(int argc, char **argv) * place, so no cleanup needed. */ if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) { @@ -27,12 +28,12 @@ + rte_eal_init_alert("Cannot clear runtime directory"); return -1; } - if (!internal_config.no_telemetry) { -diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c -index f162124a3..28a8b7851 100644 ---- a/lib/librte_eal/linux/eal.c -+++ b/lib/librte_eal/linux/eal.c -@@ -1290,7 +1290,7 @@ rte_eal_init(int argc, char **argv) + +diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c +index e6d4cc717..8f1bcab39 100644 +--- a/lib/librte_eal/linux/eal/eal.c ++++ b/lib/librte_eal/linux/eal/eal.c +@@ -1288,7 +1288,7 @@ rte_eal_init(int argc, char **argv) * place, so no cleanup needed. */ if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) { @@ -40,7 +41,7 @@ + rte_eal_init_alert("Cannot clear runtime directory"); return -1; } - if (!internal_config.no_telemetry) { + -- 2.20.1